Compare commits

...

5 Commits

Author SHA1 Message Date
Jeremy Soller 34154b86c0
Merge branch 'master' of https://gitlab.redox-os.org/redox-os/redox 2020-07-15 16:11:05 -06:00
Jeremy Soller 5af73eda15
Update kernel 2020-07-15 16:11:00 -06:00
Jeremy Soller abe99bba7c
Set march to x86-64 in CFLAGS and CXXFLAGS when compiling prefix 2020-07-15 15:41:14 -06:00
Jeremy Soller 1b3ded69be
Attempt to compile binutils and gcc for generic x86_64 2020-07-15 13:10:16 -06:00
Jeremy Soller 77f7828f3f
Update cookbook 2020-07-15 09:55:58 -06:00
3 changed files with 7 additions and 2 deletions

@ -1 +1 @@
Subproject commit 151ee09b8b6637be6b163f4bd3241a051b06eddb Subproject commit 9a60468f0f744c1ae4c6d473c12b71f81dd470cb

2
kernel

@ -1 +1 @@
Subproject commit dbfc8ab188d88a08acf1d31f7c80e4767643b0e3 Subproject commit 1e44f157d0408c7848181fe4293db220bff05a54

View File

@ -75,6 +75,7 @@ $(PREFIX)/binutils-install: $(PREFIX)/binutils
rm -rf "$<-build" "$@.partial" "$@" rm -rf "$<-build" "$@.partial" "$@"
mkdir -p "$<-build" "$@.partial" mkdir -p "$<-build" "$@.partial"
cd "$<-build" && \ cd "$<-build" && \
export CFLAGS="-march=x86-64" CXXFLAGS="-march=x86-64" && \
"$(ROOT)/$</configure" \ "$(ROOT)/$</configure" \
--target="$(TARGET)" \ --target="$(TARGET)" \
--program-prefix="$(TARGET)-" \ --program-prefix="$(TARGET)-" \
@ -106,6 +107,7 @@ $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc | $(PREFIX)/binutils-install
cp -r "$(PREFIX)/binutils-install" "$@.partial" cp -r "$(PREFIX)/binutils-install" "$@.partial"
cd "$<-freestanding-build" && \ cd "$<-freestanding-build" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
export CFLAGS="-march=x86-64" CXXFLAGS="-march=x86-64" && \
"$(ROOT)/$</configure" \ "$(ROOT)/$</configure" \
--target="$(TARGET)" \ --target="$(TARGET)" \
--program-prefix="$(TARGET)-" \ --program-prefix="$(TARGET)-" \
@ -127,6 +129,7 @@ $(PREFIX)/rust-freestanding-install: $(ROOT)/rust | $(PREFIX)/binutils-install
cp -r "$(PREFIX)/binutils-install" "$@.partial" cp -r "$(PREFIX)/binutils-install" "$@.partial"
cd "$(PREFIX)/rust-freestanding-build" && \ cd "$(PREFIX)/rust-freestanding-build" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
export CFLAGS="-march=x86-64" CXXFLAGS="-march=x86-64" && \
"$</configure" \ "$</configure" \
--prefix="/" \ --prefix="/" \
--disable-docs \ --disable-docs \
@ -162,6 +165,7 @@ $(PREFIX)/gcc-install: $(PREFIX)/gcc | $(PREFIX)/relibc-freestanding-install
cp -r "$(PREFIX_BASE_INSTALL)" "$@.partial" cp -r "$(PREFIX_BASE_INSTALL)" "$@.partial"
cd "$<-build" && \ cd "$<-build" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
export CFLAGS="-march=x86-64" CXXFLAGS="-march=x86-64" && \
"$(ROOT)/$</configure" \ "$(ROOT)/$</configure" \
--target="$(TARGET)" \ --target="$(TARGET)" \
--program-prefix="$(TARGET)-" \ --program-prefix="$(TARGET)-" \
@ -199,6 +203,7 @@ $(PREFIX)/rust-install: $(ROOT)/rust | $(PREFIX)/gcc-install $(PREFIX)/relibc-fr
cp -r "$(PREFIX)/relibc-freestanding-install/$(TARGET)" "$@.partial" cp -r "$(PREFIX)/relibc-freestanding-install/$(TARGET)" "$@.partial"
cd "$(PREFIX)/rust-build" && \ cd "$(PREFIX)/rust-build" && \
export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
export CFLAGS="-march=x86-64" CXXFLAGS="-march=x86-64" && \
"$</configure" \ "$</configure" \
--prefix="/" \ --prefix="/" \
--disable-docs \ --disable-docs \