diff options
| -rw-r--r-- | compiler-rt/make/AppleBI.mk | 3 | ||||
| -rw-r--r-- | compiler-rt/make/config.mk | 1 | ||||
| -rw-r--r-- | compiler-rt/make/lib_info.mk | 2 | ||||
| -rw-r--r-- | compiler-rt/make/options.mk | 1 | ||||
| -rw-r--r-- | compiler-rt/make/platform/darwin_bni.mk | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/compiler-rt/make/AppleBI.mk b/compiler-rt/make/AppleBI.mk index 96f8222c7b5..b5e702b10e6 100644 --- 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 12d8bc201a0..6398d058de7 100644 --- 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 5e668160e7c..31850f78f98 100644 --- 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 ec4a55df748..67197de03f4 100644 --- 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 000181c1e5c..d12cfdff704 100644 --- 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),) |
