Fix strip issue Joel ran into

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5449 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.Linux b/Makefile.Linux
index bb714e4f03b9ca497a0da93a5a68627d3fe07177..a8206c4865e8d5e97de49661e492046d55560e0c 100644 (file)
--- 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 e9473637c7e699c5b32f21ca067d2ed2f7fb584f..43b5c0b2c71d7fb7a44d581d9d84861a310df76b 100644 (file)
--- 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 37cce15f70fd147f1af95f86719e310115cda08c..25794fa5403dd48facfce53a9a7b58eb9224af80 100644 (file)
--- 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 37cce15f70fd147f1af95f86719e310115cda08c..25794fa5403dd48facfce53a9a7b58eb9224af80 100644 (file)
--- 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