Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
redox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
redox
Commits
2ae7a392
Commit
2ae7a392
authored
1 year ago
by
Jeremy Soller
Browse files
Options
Downloads
Plain Diff
Merge branch 'unset-cc-and-cxx-in-prefix-build' into 'master'
Two fixes for the MacOS prefix build Closes
#1372
See merge request
!1331
parents
226954e8
9b842be0
No related branches found
No related tags found
1 merge request
!1331
Two fixes for the MacOS prefix build
Pipeline
#11899
passed
1 year ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bootstrap.sh
+2
-0
2 additions, 0 deletions
bootstrap.sh
mk/prefix.mk
+3
-0
3 additions, 0 deletions
mk/prefix.mk
with
5 additions
and
0 deletions
bootstrap.sh
+
2
−
0
View file @
2ae7a392
...
...
@@ -109,6 +109,7 @@ osx_macports()
install_macports_pkg
"ninja"
install_macports_pkg
"po4a"
install_macports_pkg
"findutils"
install_macports_pkg
"texinfo"
}
###############################################################################
...
...
@@ -144,6 +145,7 @@ osx_homebrew()
install_brew_pkg
"po4a"
install_brew_pkg
"macfuse"
install_brew_pkg
"findutils"
install_brew_pkg
"texinfo"
install_brew_pkg
"redox-os/gcc_cross_compilers/x86_64-elf-gcc"
"x86_64-elf-gcc"
}
...
...
This diff is collapsed.
Click to expand it.
mk/prefix.mk
+
3
−
0
View file @
2ae7a392
...
...
@@ -7,6 +7,9 @@ export PREFIX_RUSTFLAGS=-L $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib
export
RUSTUP_TOOLCHAIN
=
$(
ROOT
)
/
$(
PREFIX_INSTALL
)
export
REDOXER_TOOLCHAIN
=
$(
RUSTUP_TOOLCHAIN
)
export
CC
=
export
CXX
=
prefix
:
$(PREFIX_INSTALL)
PREFIX_STRIP
=
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment