diff options
Diffstat (limited to 'make/AppleBI.mk')
| -rw-r--r-- | make/AppleBI.mk | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/make/AppleBI.mk b/make/AppleBI.mk index 8cbce5fbaf56..184c16ad84e9 100644 --- a/make/AppleBI.mk +++ b/make/AppleBI.mk @@ -14,8 +14,14 @@ endif ifeq (,$(SDKROOT)) INSTALL_TARGET = install-MacOSX + LD_OTHER_FLAGS = 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) + LD_OTHER_FLAGS = -Wl,-alias_list,$(SRCROOT)/lib/arm/softfloat-alias.list -isysroot $(SDKROOT) endif @@ -48,11 +54,11 @@ install-MacOSX : $(SYMROOT)/libcompiler_rt.dylib # Rule to make each dylib slice $(OBJROOT)/libcompiler_rt-%.dylib : $(OBJROOT)/darwin_bni/Release/%/libcompiler_rt.a echo "const char vers[] = \"@(#) $(RC_ProjectName)-$(RC_ProjectSourceVersion)\"; " > $(OBJROOT)/version.c - cc $(OBJROOT)/version.c -arch $* -dynamiclib \ + $(CC.Release) $(OBJROOT)/version.c -arch $* -dynamiclib \ -install_name /usr/lib/system/libcompiler_rt.dylib \ -compatibility_version 1 -current_version $(RC_ProjectSourceVersion) \ -nodefaultlibs -lSystem -umbrella System -dead_strip \ - -Wl,-force_load,$^ -o $@ + $(LD_OTHER_FLAGS) -Wl,-force_load,$^ -o $@ # Rule to make fat dylib $(SYMROOT)/libcompiler_rt.dylib: $(foreach arch,$(RC_ARCHS), \ @@ -63,19 +69,15 @@ $(SYMROOT)/libcompiler_rt.dylib: $(foreach arch,$(RC_ARCHS), \ # Copy results to DSTROOT. -install-iOS: $(SYMROOT)/libcompiler_rt.a $(SYMROOT)/libcompiler_rt-static.a - mkdir -p $(DSTROOT)/usr/local/lib/libgcc - cp $(SYMROOT)/libcompiler_rt.a \ - $(DSTROOT)/usr/local/lib/libgcc/libcompiler_rt.a - mkdir -p $(DSTROOT)/usr/local/ +install-iOS: $(SYMROOT)/libcompiler_rt-static.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/lib/system + strip -S $(SYMROOT)/libcompiler_rt.dylib \ + -o $(DSTROOT)/usr/lib/system/libcompiler_rt.dylib - -# Rule to make fat archive -$(SYMROOT)/libcompiler_rt.a : $(foreach arch,$(RC_ARCHS), \ - $(OBJROOT)/darwin_bni/Release/$(arch)/libcompiler_rt.a) - lipo -create $^ -o $@ # Rule to make fat archive $(SYMROOT)/libcompiler_rt-static.a : $(foreach arch,$(RC_ARCHS), \ |