diff options
author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-10-24 14:03:41 +0000 |
---|---|---|
committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-10-24 14:03:41 +0000 |
commit | 64579da1a7963999917a26d364a9884aeba69fd5 (patch) | |
tree | e4e79d8db6f166dc56b1f7051c24469fd20d606e /compiler-rt/Makefile | |
parent | 78d1210f38594d1412cddd1f8cc660a788d2c11b (diff) | |
download | bcm5719-llvm-64579da1a7963999917a26d364a9884aeba69fd5.tar.gz bcm5719-llvm-64579da1a7963999917a26d364a9884aeba69fd5.zip |
Build ASan runtime for ARM/Android.
llvm-svn: 166559
Diffstat (limited to 'compiler-rt/Makefile')
-rw-r--r-- | compiler-rt/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/compiler-rt/Makefile b/compiler-rt/Makefile index aea6b887866..63b05367b12 100644 --- a/compiler-rt/Makefile +++ b/compiler-rt/Makefile @@ -133,10 +133,12 @@ $(call Set,Tmp.Config,$(1)) $(call Set,Tmp.ObjPath,$(ProjObjRoot)/$(Tmp.Name)/$(Tmp.Config)) $(call Set,Tmp.SHARED_LIBRARY,$(strip \ $(call GetCNAVar,SHARED_LIBRARY,$(Tmp.Key),$(Tmp.Config),$(Tmp.Arch)))) +$(call Set,Tmp.SHARED_LIBRARY_SUFFIX,$(strip \ + $(call GetCNAVar,SHARED_LIBRARY_SUFFIX,$(Tmp.Key),$(Tmp.Config),$(Tmp.Arch)))) # Compute the library suffix. $(if $(call streq,1,$(Tmp.SHARED_LIBRARY)), - $(call Set,Tmp.LibrarySuffix,dylib), + $(call Set,Tmp.LibrarySuffix,$(Tmp.SHARED_LIBRARY_SUFFIX)), $(call Set,Tmp.LibrarySuffix,a)) # Compute the archs to build, depending on whether this is a universal build or @@ -192,7 +194,7 @@ $(call Set,Tmp.SHARED_LIBRARY,$(strip \ # Compute the library suffix. $(if $(call streq,1,$(Tmp.SHARED_LIBRARY)), - $(call Set,Tmp.LibrarySuffix,dylib), + $(call Set,Tmp.LibrarySuffix,$(Tmp.SHARED_LIBRARY_SUFFIX)), $(call Set,Tmp.LibrarySuffix,a)) # Compute the object inputs for this library. @@ -210,6 +212,10 @@ $(Tmp.ObjPath)/libcompiler_rt.dylib: $(Tmp.Inputs) $(Tmp.ObjPath)/.dir $(Summary) " DYLIB: $(Tmp.Name)/$(Tmp.Config)/$(Tmp.Arch): $$@" $(Verb) $(Tmp.CC) -arch $(Tmp.Arch) -dynamiclib -o $$@ \ $(Tmp.Inputs) $(Tmp.LDFLAGS) +$(Tmp.ObjPath)/libcompiler_rt.so: $(Tmp.Inputs) $(Tmp.ObjPath)/.dir + $(Summary) " SO: $(Tmp.Name)/$(Tmp.Config)/$(Tmp.Arch): $$@" + $(Verb) $(Tmp.CC) -shared -o $$@ \ + $(Tmp.Inputs) $(Tmp.LDFLAGS) .PRECIOUS: $(Tmp.ObjPath)/.dir # Per-Config-Arch Targets |