From 24fa7a9a85cc48e25b9e8fa263934e221df37451 Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Fri, 31 Jan 2003 19:00:26 +0000
Subject: [PATCH] Fix strip issue Joel ran into

llvm-svn: 5449
---
 Makefile.Linux  | 4 ++++
 Makefile.SunOS  | 7 +++++++
 Makefile.common | 8 ++++----
 Makefile.rules  | 8 ++++----
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Makefile.Linux b/Makefile.Linux
index bb714e4f03b..a8206c4865e 100644
--- a/Makefile.Linux
+++ b/Makefile.Linux
@@ -18,6 +18,10 @@ MakeSharedObjectOption := -shared
 #
 PLATFORMLINKOPTS := -Wl,--export-dynamic
 
+# PLATFORMSTRIPOPTS - Command to pass to the link phase to cause symbols to be 
+# stripped from the resultant binary.
+PLATFORMSTRIPOPTS := -Wl,-x
+
 # Path to location for LLVM front-end for this architecture.  This setting may
 # be overriden by the Makefile.config option, and should not override it if set.
 #
diff --git a/Makefile.SunOS b/Makefile.SunOS
index e9473637c7e..43b5c0b2c71 100644
--- a/Makefile.SunOS
+++ b/Makefile.SunOS
@@ -17,6 +17,13 @@ MakeSharedObjectOption := -G
 # of mallinfo.
 PLATFORMLINKOPTS := -lmalloc
 
+# PLATFORMSTRIPOPTS - Command to pass to the link phase to cause symbols to be 
+# stripped from the resultant binary.
+#
+# FIXME: I don't know what this is for sun, so leave it alone
+#
+PLATFORMSTRIPOPTS :=
+
 # Path to location for LLVM front-end for this architecture.  This setting may
 # be overriden by the Makefile.config option, and should not override it if set.
 #
diff --git a/Makefile.common b/Makefile.common
index 37cce15f70f..25794fa5403 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -142,10 +142,10 @@ endif
 # By default, strip symbol information from executable
 ifdef KEEP_SYMBOLS
 STRIP =
-WARN_MSG =
+STRIP_WARN_MSG =
 else
-STRIP = -Wl,-x
-WARN_MSG = "(without symbols) "
+STRIP = $(PLATFORMSTRIPOPTS)
+STRIP_WARN_MSG = "(without symbols) "
 endif
 
 # Allow gnu extensions...
@@ -406,7 +406,7 @@ clean::
 	$(VERB) rm -f $(TOOLEXENAMES)
 
 $(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(TOOLDEBUG)/.dir
-	@echo ======= Linking $(TOOLNAME) debug executable $(WARN_MSG) =======
+	@echo ======= Linking $(TOOLNAME) debug executable $(STRIP_WARN_MSG) =======
 	$(VERB) $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_G) $(LINK_OPTS)
 
 $(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(TOOLRELEASE)/.dir
diff --git a/Makefile.rules b/Makefile.rules
index 37cce15f70f..25794fa5403 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -142,10 +142,10 @@ endif
 # By default, strip symbol information from executable
 ifdef KEEP_SYMBOLS
 STRIP =
-WARN_MSG =
+STRIP_WARN_MSG =
 else
-STRIP = -Wl,-x
-WARN_MSG = "(without symbols) "
+STRIP = $(PLATFORMSTRIPOPTS)
+STRIP_WARN_MSG = "(without symbols) "
 endif
 
 # Allow gnu extensions...
@@ -406,7 +406,7 @@ clean::
 	$(VERB) rm -f $(TOOLEXENAMES)
 
 $(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(TOOLDEBUG)/.dir
-	@echo ======= Linking $(TOOLNAME) debug executable $(WARN_MSG) =======
+	@echo ======= Linking $(TOOLNAME) debug executable $(STRIP_WARN_MSG) =======
 	$(VERB) $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_G) $(LINK_OPTS)
 
 $(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(TOOLRELEASE)/.dir