From 2dd6efcdc486cd79cca077db453781059746fd42 Mon Sep 17 00:00:00 2001
From: spider <spider@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 4 Jun 1998 07:20:48 +0000
Subject: [PATCH] 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
---
 mozilla/gconfig/IRIX.mk  | 3 +++
 mozilla/gconfig/Linux.mk | 4 ++++
 mozilla/gconfig/UNIX.mk  | 3 +++
 mozilla/gconfig/rules.mk | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mozilla/gconfig/IRIX.mk b/mozilla/gconfig/IRIX.mk
index 534209e8a7f..055211b66ac 100644
--- 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
\ No newline at end of file
diff --git a/mozilla/gconfig/Linux.mk b/mozilla/gconfig/Linux.mk
index e703f256d46..0603e33b3ba 100644
--- 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
\ No newline at end of file
diff --git a/mozilla/gconfig/UNIX.mk b/mozilla/gconfig/UNIX.mk
index 7d459465765..c8491b00758 100644
--- 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
diff --git a/mozilla/gconfig/rules.mk b/mozilla/gconfig/rules.mk
index ab95523dbc4..b29fb137386 100644
--- 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