diff options
Diffstat (limited to 'pr/src/Makefile.in')
| -rw-r--r-- | pr/src/Makefile.in | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in index d4af5676..f33f124d 100644 --- a/pr/src/Makefile.in +++ b/pr/src/Makefile.in @@ -69,7 +69,13 @@ ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_RELEASE),4.1.3_U1) OS_LIBS = -lm else # 4.1.3_U1 - +MAPFILE = $(OBJDIR)/nsprmap.sun +GARBAGE += $(MAPFILE) +ifdef NS_USE_GCC +MKSHLIB += -Wl,-M,$(MAPFILE) +else +MKSHLIB += -M $(MAPFILE) +endif # # In Solaris 2.6 or earlier, -lrt is called -lposix4. # @@ -81,14 +87,19 @@ LIBRT=-lposix4 endif ifdef USE_PTHREADS -OS_LIBS = -lpthread -lthread ${LIBRT} -lsocket -lnsl -ldl +OS_LIBS = -lpthread -lthread ${LIBRT} -lsocket -lnsl -ldl -lc else ifdef LOCAL_THREADS_ONLY -OS_LIBS = -lsocket -lnsl -ldl +OS_LIBS = -lsocket -lnsl -ldl -lc else -OS_LIBS = -lthread ${LIBRT} -lsocket -lnsl -ldl +OS_LIBS = -lthread ${LIBRT} -lsocket -lnsl -ldl -lc endif # LOCAL_THREADS_ONLY endif # USE_PTHREADS +ifeq ($(OS_TEST),sun4u) +ifndef USE_64 +DSO_LDOPTS += -Wl,-f,\$$ORIGIN/cpu/\$$ISALIST/lib$(ULTRASPARC_LIBRARY)$(LIBRARY_VERSION).so +endif +endif # sun4u endif # 4.1.3_U1 endif # SunOS @@ -137,9 +148,9 @@ endif ifeq ($(OS_ARCH),Linux) ifeq ($(USE_PTHREADS), 1) -OS_LIBS = -lpthread -ldl -lc +OS_LIBS = -lpthread -ldl else -OS_LIBS = -ldl -lc +OS_LIBS = -ldl endif endif @@ -170,8 +181,16 @@ OS_LIBS = -lsocket -lnsl -lgen -lresolv endif ifeq ($(OS_ARCH),WINNT) +ifdef NS_USE_GCC +OS_LIBS = -ladvapi32 -lws2_32 +else OS_LIBS = advapi32.lib wsock32.lib endif +endif + +ifeq ($(OS_TARGET),MacOSX) +OS_LIBS = -framework CoreServices -framework CoreFoundation +endif ifdef GC_LEAK_DETECTOR EXTRA_LIBS = -L$(dist_libdir) -lboehm @@ -281,7 +300,11 @@ OBJS += memory/$(OBJDIR)/prgcleak.$(OBJ_SUFFIX) endif ifeq ($(OS_ARCH), WINNT) +ifdef NS_USE_GCC +DLLBASE=-Wl,--image-base -Wl,0x30000000 +else DLLBASE=/BASE:0x30000000 +endif # GCC RES=$(OBJDIR)/nspr.res RESNAME=nspr.rc endif # WINNT @@ -320,7 +343,7 @@ NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now SH_DATE = $(shell date "+%Y-%m-%d %T") SH_NOW = $(shell $(NOW)) -ifeq ($(OS_ARCH), WINNT) +ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) SUF = i64 else SUF = LL @@ -342,7 +365,7 @@ $(TINC): $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) -ifeq ($(OS_ARCH), WINNT) +ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) $(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $< else ifeq ($(MOZ_OS2_TOOLS), VACPP) |