Automatically create .dSYM for libcompiler_rt.dylib when using Apple's internal build...

llvm-svn: 168625

diff --git a/compiler-rt/make/AppleBI.mk b/compiler-rt/make/AppleBI.mk
index 96f8222..b5e702b 100644 (file)
--- a/compiler-rt/make/AppleBI.mk
+++ b/compiler-rt/make/AppleBI.mk
@@ -64,8 +64,7 @@ $(OBJROOT)/libcompiler_rt-%.dylib : $(OBJROOT)/darwin_bni/Release/%/libcompiler_
 $(SYMROOT)/libcompiler_rt.dylib: $(foreach arch,$(filter-out armv4t,$(RC_ARCHS)), \
                                         $(OBJROOT)/libcompiler_rt-$(arch).dylib)
        $(call GetCNAVar,LIPO,Platform.darwin_bni,Release,) -create $^ -o  $@
-
-
+       $(call GetCNAVar,DSYMUTIL,Platform.darwin_bni,Release,) $@
 
 
 # Copy results to DSTROOT.

diff --git a/compiler-rt/make/config.mk b/compiler-rt/make/config.mk
index 12d8bc2..6398d05 100644 (file)
--- a/compiler-rt/make/config.mk
+++ b/compiler-rt/make/config.mk
@@ -21,6 +21,7 @@ MKDIR := mkdir -p
 DATE := date
 LIPO := lipo
 CP := cp
+DSYMUTIL := dsymutil
 
 VERBOSE := 0
 DEBUGMAKE :=

diff --git a/compiler-rt/make/lib_info.mk b/compiler-rt/make/lib_info.mk
index 5e66816..31850f7 100644 (file)
--- a/compiler-rt/make/lib_info.mk
+++ b/compiler-rt/make/lib_info.mk
@@ -56,4 +56,4 @@ AvailableOptions := AR ARFLAGS \
                     CC CFLAGS LDFLAGS FUNCTIONS OPTIMIZED \
                     RANLIB RANLIBFLAGS \
                     VISIBILITY_HIDDEN KERNEL_USE \
-                    SHARED_LIBRARY SHARED_LIBRARY_SUFFIX STRIP LIPO
+                    SHARED_LIBRARY SHARED_LIBRARY_SUFFIX STRIP LIPO DSYMUTIL

diff --git a/compiler-rt/make/options.mk b/compiler-rt/make/options.mk
index ec4a55d..67197de 100644 (file)
--- a/compiler-rt/make/options.mk
+++ b/compiler-rt/make/options.mk
@@ -43,5 +43,6 @@ RANLIBFLAGS := 2> /dev/null
 
 STRIP := strip
 LIPO := lipo
+DSYMUTIL := dsymutil
 
 SHARED_LIBRARY_SUFFIX := so

diff --git a/compiler-rt/make/platform/darwin_bni.mk b/compiler-rt/make/platform/darwin_bni.mk
index 000181c..d12cfdf 100644 (file)
--- a/compiler-rt/make/platform/darwin_bni.mk
+++ b/compiler-rt/make/platform/darwin_bni.mk
@@ -14,6 +14,7 @@ ifneq (,$(SDKROOT))
        RANLIB := $(shell xcrun -sdk $(SDKROOT) -find ranlib) 
        STRIP := $(shell xcrun -sdk $(SDKROOT) -find strip) 
        LIPO := $(shell xcrun -sdk $(SDKROOT) -find lipo)
+       DSYMUTIL := $(shell xcrun -sdk $(SDKROOT) -find dsymutil)
 endif
 
 ifneq ($(IPHONEOS_DEPLOYMENT_TARGET),)