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 .
This commit is contained in:
julien.pierre.bugs%sun.com 2005-08-26 02:17:05 +00:00
Родитель e91d8160b8
Коммит 2ffa7acc60
3 изменённых файлов: 4 добавлений и 3 удалений

Просмотреть файл

@ -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)