summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-05-19 15:25:43 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-05-19 15:25:43 (EDT)
commit43cd95d2524de32db3eccb47ac51bfccd3385b68 (patch)
tree7e9a9e860acb2b73939c620f79dbf461787f9270
parentd3fa71ae25bac965624dd86c4ef4b3bd3273aa57 (diff)
build: Don't override STANDARD_STARTFILE_PREFIX_[12]
If not set, gcc/gcc.c sets these to "/lib" and "/usr/lib". Setting both to "" prevented this, but caused libgcc_s.so (libgcc/Makefile.in lines 979-991) build failures: # @multilib_flags@ is still needed because this may use # /prokit/sessions/222768606/wd/tmp/obj-amd64-linux-glibc/./gcc/xgcc -B/prokit/sessions/222768606/wd/tmp/obj-amd64-linux-glibc/./gcc/ -B/usr/x86_64-unknown-linux-gnu/bin/ -B/usr/x86_64-unknown-linux-gnu/lib/ -isystem /usr/x86_64-unknown-linux-gnu/include -isystem /usr/x86_64-unknown-linux-gnu/sys-include and -O2 -g -O2 -DIN_GCC -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fpic -mlong-double-80 -DUSE_ELF_SYMVER -g -DIN_LIBGCC2 -fbuilding-libgcc -fno-stack-protector directly. # @multilib_dir@ is not really necessary, but sometimes it has # more uses than just a directory name. /bin/sh /prokit/sessions/222768606/wd/tmp/src/libgcc/../mkinstalldirs . /prokit/sessions/222768606/wd/tmp/obj-amd64-linux-glibc/./gcc/xgcc -B/prokit/sessions/222768606/wd/tmp/obj-amd64-linux-glibc/./gcc/ -B/usr/x86_64-unknown-linux-gnu/bin/ -B/usr/x86_64-unknown-linux-gnu/lib/ -isystem /usr/x86_64-unknown-linux-gnu/include -isystem /usr/x86_64-unknown-linux-gnu/sys-include -O2 -g -O2 -DIN_GCC -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fpic -mlong-double-80 -DUSE_ELF_SYMVER -g -DIN_LIBGCC2 -fbuilding-libgcc -fno-stack-protector -shared -nodefaultlibs -Wl,--soname=libgcc_s.so.1 -Wl,--version-script=libgcc.map -o ./libgcc_s.so.1.tmp -g -O2 -B./ _muldi3_s.o _negdi2_s.o _lshrdi3_s.o _ashldi3_s.o _ashrdi3_s.o _cmpdi2_s.o _ucmpdi2_s.o _clear_cache_s.o _trampoline_s.o __main_s.o _absvsi2_s.o _absvdi2_s.o _addvsi3_s.o _addvdi3_s.o _subvsi3_s.o _subvdi3_s.o _mulvsi3_s.o _mulvdi3_s.o _negvsi2_s.o _negvdi2_s.o _ctors_s.o _ffssi2_s.o _ffsdi2_s.o _clz_s.o _clzsi2_s.o _clzdi2_s.o _ctzsi2_s.o _ctzdi2_s.o _popcount_tab_s.o _popcountsi2_s.o _popcountdi2_s.o _paritysi2_s.o _paritydi2_s.o _powisf2_s.o _powidf2_s.o _powixf2_s.o _mulhc3_s.o _mulsc3_s.o _muldc3_s.o _mulxc3_s.o _divhc3_s.o _divsc3_s.o _divdc3_s.o _divxc3_s.o _bswapsi2_s.o _bswapdi2_s.o _clrsbsi2_s.o _clrsbdi2_s.o _fixunssfsi_s.o _fixunsdfsi_s.o _fixunsxfsi_s.o _fixsfdi_s.o _fixdfdi_s.o _fixxfdi_s.o _fixunssfdi_s.o _fixunsdfdi_s.o _fixunsxfdi_s.o _floatdisf_s.o _floatdidf_s.o _floatdixf_s.o _floatundisf_s.o _floatundidf_s.o _floatundixf_s.o _divdi3_s.o _moddi3_s.o _divmoddi4_s.o _udivdi3_s.o _umoddi3_s.o _udivmoddi4_s.o _udiv_w_sdiv_s.o cpuinfo_s.o sfp-exceptions_s.o addtf3_s.o divtf3_s.o multf3_s.o negtf2_s.o subtf3_s.o unordtf2_s.o fixtfsi_s.o fixunstfsi_s.o floatsitf_s.o floatunsitf_s.o fixtfdi_s.o fixunstfdi_s.o floatditf_s.o floatunditf_s.o fixtfti_s.o fixunstfti_s.o floattitf_s.o floatuntitf_s.o extendsftf2_s.o extenddftf2_s.o extendxftf2_s.o trunctfsf2_s.o trunctfdf2_s.o trunctfxf2_s.o getf2_s.o letf2_s.o eqtf2_s.o _divtc3_s.o _multc3_s.o _powitf2_s.o enable-execute-stack_s.o unwind-dw2_s.o unwind-dw2-fde-dip_s.o unwind-sjlj_s.o unwind-c_s.o emutls_s.o libgcc.a -lc && rm -f ./libgcc_s.so && if [ -f ./libgcc_s.so.1 ]; then mv -f ./libgcc_s.so.1 ./libgcc_s.so.1.backup; else true; fi && mv ./libgcc_s.so.1.tmp ./libgcc_s.so.1 && (echo "/* GNU ld script"; echo " Use the shared library, but some functions are only in"; echo " the static library. */"; echo "GROUP ( libgcc_s.so.1 -lgcc )" ) > ./libgcc_s.so /usr/bin/ld: cannot find crti.o: No such file or directory collect2: error: ld returned 1 exit status Makefile:980: recipe for target 'libgcc_s.so' failed make[4]: *** [libgcc_s.so] Error 1 make[4]: Leaving directory '/prokit/sessions/222768606/wd/tmp/obj-amd64-linux-glibc/x86_64-unknown-linux-gnu/libgcc' Makefile:13134: recipe for target 'all-target-libgcc' failed make[3]: *** [all-target-libgcc] Error 2 make[3]: Leaving directory '/prokit/sessions/222768606/wd/tmp/obj-amd64-linux-glibc' Makefile:911: recipe for target 'all' failed make[2]: *** [all] Error 2 make[2]: Leaving directory '/prokit/sessions/222768606/wd/tmp/obj-amd64-linux-glibc' ../build:135: recipe for target 'build-native' failed make[1]: *** [build-native] Error 2 make[1]: Leaving directory '/prokit/sessions/222768606/wd/tmp' ../build:305: recipe for target 'build' failed make: *** [build] Error 2
-rwxr-xr-xbuild2
1 files changed, 0 insertions, 2 deletions
diff --git a/build b/build
index 51005e9..64f96fa 100755
--- a/build
+++ b/build
@@ -129,8 +129,6 @@ build-gcc-config:
STANDARD_EXEC_PREFIX "$(tgtlibdir)/" >>"$(tm)/$(tm_file)"
printf '\n#undef %s\n#define %s "%s"\n' STANDARD_LIBEXEC_PREFIX \
STANDARD_LIBEXEC_PREFIX "$(gccexedir)/" >>"$(tm)/$(tm_file)"
- printf '#define %s ""\n' STANDARD_STARTFILE_PREFIX_1 \
- STANDARD_STARTFILE_PREFIX_2 >>"$(tm)/$(tm_file)"
[ -e "$(tm)/$(tmake_file).orig" ] || \
mv "$(tm)/$(tmake_file)" "$(tm)/$(tmake_file).orig"
sed "$(tmake_script)" "$(tm)/$(tmake_file).orig" >"$(tm)/$(tmake_file)"