Fix for 297802 . r=wtchang . Add $(OS_LIBS) to MKSHLIB rules.
Add -z defs linker option for Solaris and Linux . Also add -z ignore on Solaris . git-svn-id: svn://10.0.0.236/trunk@179021 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
7af9e82438
commit
31fda2d059
@ -165,7 +165,7 @@ endif
|
||||
ARCH = linux
|
||||
|
||||
DSO_CFLAGS = -fPIC
|
||||
DSO_LDOPTS = -shared $(ARCHFLAG)
|
||||
DSO_LDOPTS = -shared $(ARCHFLAG) -z defs
|
||||
DSO_LDFLAGS =
|
||||
LDFLAGS += $(ARCHFLAG)
|
||||
|
||||
|
||||
@ -191,6 +191,7 @@ ifdef NS_USE_GCC
|
||||
else
|
||||
DSO_CFLAGS += -KPIC
|
||||
endif
|
||||
DSO_LDOPTS += -z combreloc -z defs -z ignore
|
||||
|
||||
NOSUCHFILE = /solaris-rm-f-sucks
|
||||
|
||||
|
||||
@ -348,9 +348,9 @@ else
|
||||
endif
|
||||
else
|
||||
ifdef XP_OS2_VACPP
|
||||
$(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
|
||||
$(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
|
||||
else
|
||||
$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
|
||||
$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
|
||||
endif
|
||||
chmod +x $@
|
||||
ifeq ($(OS_TARGET),Darwin)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user