Print this page
12311 adjust NATIVE_LIBS in SMF makefiles
*** 22,32 ****
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Copyright 2015 RackTop Systems.
#
! # Copyright 2019 Joyent, Inc.
#
MYPROG = svc.configd
MYOBJS = \
backend.o \
--- 22,32 ----
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Copyright 2015 RackTop Systems.
#
! # Copyright 2020 Joyent, Inc.
#
MYPROG = svc.configd
MYOBJS = \
backend.o \
*** 76,87 ****
SCRIPTFILE = restore_repository
ROOTSCRIPTFILE = $(ROOTCMDDIR)/$(SCRIPTFILE)
#
! # Native variant (used in ../seed)
#
$(NATIVE_BUILD)CC = $(NATIVECC)
$(NATIVE_BUILD)LD = $(NATIVELD)
$(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS)
$(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc
$(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD
--- 76,89 ----
SCRIPTFILE = restore_repository
ROOTSCRIPTFILE = $(ROOTCMDDIR)/$(SCRIPTFILE)
#
! # Native variant (used in ../seed). We only need to set NATIVE_LIBS if
! # $(ADJUNCT_PROTO) is pointing outside of /usr/lib.
#
+ $(NO_ADJUNCT_PROTO)NATIVE_LIBS += libumem.so libc.so
$(NATIVE_BUILD)CC = $(NATIVECC)
$(NATIVE_BUILD)LD = $(NATIVELD)
$(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS)
$(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc
$(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD