Support for Archive Libs on Linux and shared data in executable

git-svn-id: svn://10.0.0.236/trunk@3180 18797224-902f-48f8-a5cc-f745e15eee43
1998-06-04 07:20:48 +00:00
parent 1b6c939920
commit 2dd6efcdc4
4 changed files with 11 additions and 1 deletions
--- a/mozilla/gconfig/IRIX.mk
+++ b/mozilla/gconfig/IRIX.mk
@@ -93,3 +93,6 @@ DSO_LDOPTS	= -elf -shared -all
 ifdef DSO_BACKEND
 	DSO_LDOPTS += -soname $(DSO_NAME)
 endif
+
+AR_ALL  = -all
+AR_NONE = -none
--- a/mozilla/gconfig/Linux.mk
+++ b/mozilla/gconfig/Linux.mk
@@ -67,3 +67,7 @@ DSO_LDOPTS		= -shared
 DSO_LDFLAGS		=

 G++INCLUDES		= -I/usr/include/g++
+
+AR_ALL = --whole-archive
+AR_NONE = --no-whole-archive
+LINK_PROGRAM += -rdynamic
--- a/mozilla/gconfig/UNIX.mk
+++ b/mozilla/gconfig/UNIX.mk
@@ -48,6 +48,9 @@ NATIVE_PLATFORM = unix
 NATIVE_RAPTOR_WIDGET = widgetunix
 NATIVE_RAPTOR_GFX = gfxunix

+AR_ALL =
+AR_NONE =
+
 ####################################################################
 #
 # One can define the makefile variable NSDISTMODE to control
--- a/mozilla/gconfig/rules.mk
+++ b/mozilla/gconfig/rules.mk
@@ -290,7 +290,7 @@ else
 endif
 endif
 else
-	$(MKSHLIB) -o $@ $(OBJS) -all $(AR_LIBS) -none $(LD_LIBS) $(EXTRA_LIBS) $(OS_LIBS)
+	$(MKSHLIB) -o $@ $(OBJS) $(AR_ALL) $(AR_LIBS) $(AR_NONE) $(LD_LIBS) $(EXTRA_LIBS) $(OS_LIBS)
 	chmod +x $@
 endif
 endif