vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.redox-os.org/redox-os/redox

Browse source
This commit is contained in:
Jeremy Soller 2020-07-15 16:11:05 -06:00
parent 5af73eda15 abe99bba7c
commit 34154b86c0
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mk/prefix.mk
View file

@ -75,12 +75,12 @@ $(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)-" \
--prefix="" \ --prefix="" \
--disable-werror \ --disable-werror \
--with-arch=x86-64 \
&& \ && \
$(MAKE) -j `$(NPROC)` all && \ $(MAKE) -j `$(NPROC)` all && \
$(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial" $(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial"
@ -107,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)-" \
@ -114,7 +115,6 @@ $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc | $(PREFIX)/binutils-install
--disable-nls \ --disable-nls \
--enable-languages=c,c++ \ --enable-languages=c,c++ \
--without-headers \ --without-headers \
--with-arch=x86-64 \
&& \ && \
$(MAKE) -j `$(NPROC)` all-gcc && \ $(MAKE) -j `$(NPROC)` all-gcc && \
$(MAKE) -j `$(NPROC)` install-gcc DESTDIR="$(ROOT)/$@.partial" $(MAKE) -j `$(NPROC)` install-gcc DESTDIR="$(ROOT)/$@.partial"
@ -129,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 \
@ -164,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)-" \
@ -177,7 +179,6 @@ $(PREFIX)/gcc-install: $(PREFIX)/gcc | $(PREFIX)/relibc-freestanding-install
--enable-languages=c,c++ \ --enable-languages=c,c++ \
--enable-shared \ --enable-shared \
--enable-threads=posix \ --enable-threads=posix \
--with-arch=x86-64 \
&& \ && \
$(MAKE) -j `$(NPROC)` all-gcc all-target-libgcc all-target-libstdc++-v3 && \ $(MAKE) -j `$(NPROC)` all-gcc all-target-libgcc all-target-libstdc++-v3 && \
$(MAKE) -j `$(NPROC)` install-gcc install-target-libgcc install-target-libstdc++-v3 DESTDIR="$(ROOT)/$@.partial" && \ $(MAKE) -j `$(NPROC)` install-gcc install-target-libgcc install-target-libstdc++-v3 DESTDIR="$(ROOT)/$@.partial" && \
@ -202,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 \