diff options
Diffstat (limited to 'usr/src/Makefile.master')
| -rw-r--r-- | usr/src/Makefile.master | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index d2402d2fff..02242189d8 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -27,8 +27,8 @@ # Copyright 2015 Gary Mills # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com> # Copyright 2016 Toomas Soome <tsoome@me.com> -# Copyright 2020 Joyent, Inc. # Copyright 2018 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2020 Joyent, Inc. # Copyright 2019 RackTop Systems. # @@ -827,12 +827,16 @@ COMPILE.java= $(JAVAC) $(JAVAFLAGS) -classpath $(CLASSPATH) # CCNEEDED = -lC CCEXTNEEDED = -lCrun -lCstd +NATIVECCNEEDED = -lC $(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -lstdc++ -lgcc_s $(__GNUC)CCEXTNEEDED = $(CCNEEDED) +$(__GNUC)NATIVECCNEEDED = -R$(GCCLIBDIR) -L$(GCCLIBDIR) -lstdc++ -lgcc_s CCNEEDED64 = -lCrun CCEXTNEEDED64 = -lCrun -lCstd +NATIVECCNEEDED64 = -lCrun $(__GNUC64)CCNEEDED64 = -L$(GCCLIBDIR) -lstdc++ -lgcc_s +$(__GNUC64)NATIVECCNEEDED64 = -R$(GCCLIBDIR) -L$(GCCLIBDIR) -lstdc++ -lgcc_s $(__GNUC64)CCEXTNEEDED = $(CCNEEDED64) # Libraries we expect to use natively on the build machine |