diff options
| author | Nick Kledzik <kledzik@apple.com> | 2011-04-14 00:45:01 +0000 |
|---|---|---|
| committer | Nick Kledzik <kledzik@apple.com> | 2011-04-14 00:45:01 +0000 |
| commit | 7956ca95b55c421c99cc97932ad8f4dc5eb0e377 (patch) | |
| tree | 1f56e124b7cbf0e776754ea9ada48870e19a4788 | |
| parent | 4a3467bebb179d03af20c18133ca5d99a691322d (diff) | |
| download | compiler-rt-7956ca95b55c421c99cc97932ad8f4dc5eb0e377.tar.gz | |
<rdar://problem/9282305> install an archive for dyld and fix missing -static
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@129492 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | make/AppleBI.mk | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/make/AppleBI.mk b/make/AppleBI.mk index 184c16ad8..0e3473d51 100644 --- a/make/AppleBI.mk +++ b/make/AppleBI.mk @@ -19,8 +19,8 @@ else INSTALL_TARGET = install-iOS CFLAGS.Release.armv6 := $(CFLAGS) -Wall -Os -fomit-frame-pointer -g -isysroot $(SDKROOT) CFLAGS.Release.armv7 := $(CFLAGS) -Wall -Os -fomit-frame-pointer -g -isysroot $(SDKROOT) - CFLAGS.Static.armv6 := $(CFLAGS) -Wall -Os -fomit-frame-pointer -g -isysroot $(SDKROOT) - CFLAGS.Static.armv7 := $(CFLAGS) -Wall -Os -fomit-frame-pointer -g -isysroot $(SDKROOT) + CFLAGS.Static.armv6 := $(CFLAGS) -Wall -Os -fomit-frame-pointer -g -isysroot $(SDKROOT) -static + CFLAGS.Static.armv7 := $(CFLAGS) -Wall -Os -fomit-frame-pointer -g -isysroot $(SDKROOT) -static LD_OTHER_FLAGS = -Wl,-alias_list,$(SRCROOT)/lib/arm/softfloat-alias.list -isysroot $(SDKROOT) endif @@ -43,7 +43,11 @@ installsrc: install: $(INSTALL_TARGET) # Copy results to DSTROOT. -install-MacOSX : $(SYMROOT)/libcompiler_rt.dylib +install-MacOSX : $(SYMROOT)/libcompiler_rt.dylib \ + $(SYMROOT)/libcompiler_rt-dyld.a + mkdir -p $(DSTROOT)/usr/local/lib/dyld + cp $(SYMROOT)/libcompiler_rt-dyld.a \ + $(DSTROOT)/usr/local/lib/dyld/libcompiler_rt.a mkdir -p $(DSTROOT)/usr/lib/system strip -S $(SYMROOT)/libcompiler_rt.dylib \ -o $(DSTROOT)/usr/lib/system/libcompiler_rt.dylib @@ -70,10 +74,14 @@ $(SYMROOT)/libcompiler_rt.dylib: $(foreach arch,$(RC_ARCHS), \ # Copy results to DSTROOT. install-iOS: $(SYMROOT)/libcompiler_rt-static.a \ + $(SYMROOT)/libcompiler_rt-dyld.a \ $(SYMROOT)/libcompiler_rt.dylib mkdir -p $(DSTROOT)/usr/local/lib cp $(SYMROOT)/libcompiler_rt-static.a \ $(DSTROOT)/usr/local/lib/libcompiler_rt-static.a + mkdir -p $(DSTROOT)/usr/local/lib/dyld + cp $(SYMROOT)/libcompiler_rt-dyld.a \ + $(DSTROOT)/usr/local/lib/dyld/libcompiler_rt.a mkdir -p $(DSTROOT)/usr/lib/system strip -S $(SYMROOT)/libcompiler_rt.dylib \ -o $(DSTROOT)/usr/lib/system/libcompiler_rt.dylib @@ -84,3 +92,16 @@ $(SYMROOT)/libcompiler_rt-static.a : $(foreach arch,$(RC_ARCHS), \ $(OBJROOT)/darwin_bni/Static/$(arch)/libcompiler_rt.a) lipo -create $^ -o $@ +# rule to make each archive slice for dyld +$(OBJROOT)/libcompiler_rt-dyld-%.a : $(OBJROOT)/darwin_bni/Release/%/libcompiler_rt.a + cp $^ $@ + ar -d $@ apple_versioning.o + ar -d $@ gcc_personality_v0.o + ar -d $@ eprintf.o + ranlib $@ + +# rule to make make archive for dyld +$(SYMROOT)/libcompiler_rt-dyld.a : $(foreach arch,$(RC_ARCHS), \ + $(OBJROOT)/libcompiler_rt-dyld-$(arch).a) + lipo -create $^ -o $@ + |