Mercurial > unleashed > wips
changeset 20567:1ceaf000b6c6
Makefile.master: don't use -nodefaultlibs for c++
libstdc++ needs some libgcc symbols, and libgcc.a is in a pretty weird path
since we don't have libgcc_s.so any more. just allow default libs for c++, we
are linking against system-installed libstdc++ anyway.
| author | Lauri Tirkkonen <lotheac@iki.fi> |
|---|---|
| date | Sat, 11 May 2019 22:07:54 +0000 |
| parents | 22e10b9a408d |
| children | 409f95c745f2 |
| files | usr/src/Makefile.master |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/Makefile.master Sat May 11 21:57:31 2019 +0000 +++ b/usr/src/Makefile.master Sat May 11 22:07:54 2019 +0000 @@ -573,8 +573,7 @@ -fno-inline-functions \ -fno-builtin \ -fno-asm \ - -fdiagnostics-show-option \ - -nodefaultlibs + -fdiagnostics-show-option # The SPARC ldd and std instructions require 8-byte alignment of their # address operand. gcc correctly uses them only when the ABI requires @@ -607,13 +606,13 @@ sparcv9_AS= /usr/bin/as -xregsym=no sparcv9_LD= /usr/bin/ld -i386_CC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/gcc $(BASIC_CC_ARGS) +i386_CC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/gcc $(BASIC_CC_ARGS) -nodefaultlibs i386_CCC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/g++ $(BASIC_CC_ARGS) i386_CPP= $(GNUC_ROOT)/bin/cpp i386_AS= $(GNUC_ROOT)/bin/gcc $(BASIC_AS_ARGS) i386_LD= /usr/bin/ld -amd64_CC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/gcc $(BASIC_CC_ARGS) +amd64_CC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/gcc $(BASIC_CC_ARGS) -nodefaultlibs amd64_CCC= /usr/libexec/unleashed/gcc-wrap $(GNUC_ROOT)/bin/g++ $(BASIC_CC_ARGS) amd64_CPP= $(GNUC_ROOT)/bin/cpp amd64_AS= $(GNUC_ROOT)/bin/gcc $(BASIC_AS_ARGS)