diff options
| author | John Levon <john.levon@joyent.com> | 2020-02-21 03:29:22 -0800 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-02-26 03:45:37 -0800 |
| commit | 2944b91ec59a95e39012331cb055e960ae6d4489 (patch) | |
| tree | 79380c99b6c97a47984ee5151c4257a70418bf16 | |
| parent | 13b136d3061155363c62c9f6568d25b8b27da8f6 (diff) | |
| download | illumos-joyent-2944b91ec59a95e39012331cb055e960ae6d4489.tar.gz | |
12334 fix gcc4 build
12322 kdb: removal of unused dependency recommended
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/Makefile.master | 6 | ||||
| -rw-r--r-- | usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com | 8 | ||||
| -rw-r--r-- | usr/src/lib/libjedec/Makefile.com | 4 | ||||
| -rw-r--r-- | usr/src/tools/make/Makefile.com | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 127680a9e9..6ecaba4078 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -28,7 +28,7 @@ # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com> # Copyright 2016 Toomas Soome <tsoome@me.com> # Copyright 2018 OmniOS Community Edition (OmniOSce) Association. -# Copyright 2019, Joyent, Inc. +# Copyright 2020 Joyent, Inc. # Copyright 2019 RackTop Systems. # @@ -813,12 +813,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 diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com b/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com index 72a6b80cab..966241305e 100644 --- a/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com +++ b/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com @@ -22,6 +22,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2020 Joyent, Inc. # LIBRARY= kldap.a @@ -46,7 +47,7 @@ include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5 #override liblink INS.liblink= -$(RM) $@; $(SYMLINK) $(LIBLINKS)$(VERS) $@ -CPPFLAGS += -DHAVE_CONFIG_H \ +CPPFLAGS += -DHAVE_CONFIG_H \ -I$(SRC)/cmd/krb5/iprop \ -I$(SRC)/lib/krb5 \ -I$(SRC)/lib/krb5/kdb \ @@ -65,15 +66,12 @@ CERRWARN += -_gcc=-Wno-unused-function DYNFLAGS += $(KERBRUNPATH) # setting -L $(ROOT)/usr/lib/gss because libkdb_ldap needs mech_krb5 -LDLIBS += -L $(ROOT)/usr/lib/gss -L $(ROOTLIBDIR) -lkdb_ldap \ - -lc +LDLIBS += -L $(ROOT)/usr/lib/gss -L $(ROOTLIBDIR) -lkdb_ldap .KEEP_STATE: all: $(LIBS) -lint: lintcheck - # include library targets include $(SRC)/lib/krb5/Makefile.targ diff --git a/usr/src/lib/libjedec/Makefile.com b/usr/src/lib/libjedec/Makefile.com index 6b2f6da64d..9e9f198343 100644 --- a/usr/src/lib/libjedec/Makefile.com +++ b/usr/src/lib/libjedec/Makefile.com @@ -10,7 +10,7 @@ # # -# Copyright (c) 2018 Joyent, Inc. +# Copyright 2020 Joyent, Inc. # LIBRARY = libjedec.a @@ -28,6 +28,4 @@ SRCDIR = ../common all: $(LIBS) -lint: lintcheck - include ../../Makefile.targ diff --git a/usr/src/tools/make/Makefile.com b/usr/src/tools/make/Makefile.com index 34074bb00a..8fbe1bc1b4 100644 --- a/usr/src/tools/make/Makefile.com +++ b/usr/src/tools/make/Makefile.com @@ -10,6 +10,7 @@ # # Copyright 2015, Richard Lowe. +# Copyright 2020 Joyent, Inc. MAKE_INCLUDE= $(SRC)/cmd/make/include @@ -19,3 +20,4 @@ CFLAGS = $(NATIVE_CFLAGS) CFLAGS += $(CCVERBOSE) CCFLAGS = $(NATIVE_CCFLAGS) -_gcc4=-std=gnu++0x CPPFLAGS = -I$(MAKE_INCLUDE) $(MAKE_DEFS) +CCNEEDED = $(NATIVECCNEEDED) |