Undo CFLAGS hack after finding cause

This commit is contained in:
Jeremy Soller 2020-07-17 14:16:43 -06:00
parent 3e37034819
commit 8703773f76
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1

View file

@ -75,7 +75,6 @@ $(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)-" \
@ -107,7 +106,6 @@ $(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)-" \
@ -129,7 +127,6 @@ $(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 \
@ -165,7 +162,6 @@ $(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)-" \
@ -203,7 +199,6 @@ $(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 \