r249281 - Fix makefile build on OSX when ARM targets are not enabled

Keno Fischer via cfe-commits cfe-commits at lists.llvm.org
Sun Oct 4 11:51:04 PDT 2015


Author: kfischer
Date: Sun Oct  4 13:51:04 2015
New Revision: 249281

URL: http://llvm.org/viewvc/llvm-project?rev=249281&view=rev
Log:
Fix makefile build on OSX when ARM targets are not enabled

Summary: When LLVM/Clang is built without ARM support, the ios_kext runtime
library is not built, but without this patch, the Makefile still tries to
copy it. This is a recent regression, because the ios_kext library used
to also be built on x86_64.

Reviewers: beanz

Subscribers: aemerson, cfe-commits, rengolin

Differential Revision: http://reviews.llvm.org/D13421

Modified:
    cfe/trunk/runtime/compiler-rt/Makefile

Modified: cfe/trunk/runtime/compiler-rt/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/compiler-rt/Makefile?rev=249281&r1=249280&r2=249281&view=diff
==============================================================================
--- cfe/trunk/runtime/compiler-rt/Makefile (original)
+++ cfe/trunk/runtime/compiler-rt/Makefile Sun Oct  4 13:51:04 2015
@@ -89,8 +89,10 @@ RuntimeLibrary.darwin.Configs += ios.a p
 endif
 
 ifneq ($(IOS_SDK),)
+ifneq (,$(filter ARM AARCH64,$(TARGETS_TO_BUILD)))
 RuntimeLibrary.darwin.Configs += cc_kext_ios.a
 endif
+endif
 
 ifneq ($(IOSSIM_SDK),)
 RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib \




More information about the cfe-commits mailing list