Use -Wl,-x instead of -s: it is more portable, and in particular,

is needed on BSD (MacOS).
Also, use -Ldir instead of -L dir on the link line.  Same reason...

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

diff --git a/Makefile.common b/Makefile.common
index d58b118741772c4b65a9e998ca39d0ea1c4b1547..587065b83492cb85eba68f5fe66776821b3b3476 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -144,7 +144,7 @@ ifdef KEEP_SYMBOLS
 STRIP =
 WARN_MSG =
 else
-STRIP = -s
+STRIP = -Wl,-x
 WARN_MSG = "(without symbols) "
 endif
 
@@ -174,9 +174,9 @@ Link     := $(PURIFY) $(CXX) -static
 else
 Link     := $(CXX)
 endif
-LinkG    := $(Link) -g  -L $(LIBDEBUG) $(STRIP)
-LinkO    := $(Link) -O3 -L $(LIBRELEASE)
-LinkP    := $(Link) -O3 -L $(LIBPROFILE) $(PROFILE)
+LinkG    := $(Link) -g  -L$(LIBDEBUG) $(STRIP)
+LinkO    := $(Link) -O3 -L$(LIBRELEASE)
+LinkP    := $(Link) -O3 -L$(LIBPROFILE) $(PROFILE)
 
 # Create one .o file from a bunch of .o files...
 Relink = ld -r

diff --git a/Makefile.rules b/Makefile.rules
index d58b118741772c4b65a9e998ca39d0ea1c4b1547..587065b83492cb85eba68f5fe66776821b3b3476 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -144,7 +144,7 @@ ifdef KEEP_SYMBOLS
 STRIP =
 WARN_MSG =
 else
-STRIP = -s
+STRIP = -Wl,-x
 WARN_MSG = "(without symbols) "
 endif
 
@@ -174,9 +174,9 @@ Link     := $(PURIFY) $(CXX) -static
 else
 Link     := $(CXX)
 endif
-LinkG    := $(Link) -g  -L $(LIBDEBUG) $(STRIP)
-LinkO    := $(Link) -O3 -L $(LIBRELEASE)
-LinkP    := $(Link) -O3 -L $(LIBPROFILE) $(PROFILE)
+LinkG    := $(Link) -g  -L$(LIBDEBUG) $(STRIP)
+LinkO    := $(Link) -O3 -L$(LIBRELEASE)
+LinkP    := $(Link) -O3 -L$(LIBPROFILE) $(PROFILE)
 
 # Create one .o file from a bunch of .o files...
 Relink = ld -r