From 1f12ad8d4c92be414790542c59057b38da62884c Mon Sep 17 00:00:00 2001 From: John Levon Date: Mon, 24 Feb 2020 18:45:04 +0000 Subject: OS-8120 fix ldd guidance for GCC4 build Reviewed by: Jerry Jelinek Approved by: Jerry Jelinek --- usr/src/Makefile.master | 4 ++++ usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com | 6 ++---- usr/src/lib/libidspace/Makefile.com | 10 +++------- usr/src/lib/libjedec/Makefile.com | 7 ++----- usr/src/tools/make/Makefile.com | 2 ++ 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index d2402d2fff..ce6879be35 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -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 diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com b/usr/src/lib/krb5/plugins/kdb/ldap/Makefile.com index 72a6b80cab..a5e79c04ca 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 @@ -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/libidspace/Makefile.com b/usr/src/lib/libidspace/Makefile.com index 8cc60ffc4c..ef259c3d2f 100644 --- a/usr/src/lib/libidspace/Makefile.com +++ b/usr/src/lib/libidspace/Makefile.com @@ -10,7 +10,7 @@ # # -# Copyright (c) 2014 Joyent, Inc. All rights reserved. +# Copyright 2020 Joyent, Inc. # LIBRARY = libidspace.a @@ -23,18 +23,14 @@ include ../../Makefile.lib SRCDIR = ../common SRCS = ../../../common/idspace/id_space.c -LIBS = $(DYNLIB) $(LINTLIB) +LIBS = $(DYNLIB) -LDLIBS += -lc -lumem - -$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) +LDLIBS += -lumem .KEEP_STATE: all: $(LIBS) -lint: lintcheck - include ../../Makefile.targ objs/%.o pics/%.o: $(COMDIR)/%.c diff --git a/usr/src/lib/libjedec/Makefile.com b/usr/src/lib/libjedec/Makefile.com index 755004d099..a2138ed9ea 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 @@ -19,8 +19,7 @@ OBJECTS = libjedec.o include ../../Makefile.lib -LIBS = $(DYNLIB) $(LINTLIB) -LDLIBS += -lc +LIBS = $(DYNLIB) CPPFLAGS += -I../common SRCDIR = ../common @@ -29,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) -- cgit v1.2.3