[PATCH] D13421: Fix makefile build on OSX when ARM targets are not enabled

2015-10-04 Thread Keno Fischer via cfe-commits
loladiro created this revision.
loladiro added a reviewer: beanz.
loladiro added a subscriber: cfe-commits.
loladiro set the repository for this revision to rL LLVM.
Herald added subscribers: rengolin, aemerson.

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.

Repository:
  rL LLVM

http://reviews.llvm.org/D13421

Files:
  runtime/compiler-rt/Makefile

Index: runtime/compiler-rt/Makefile
===
--- runtime/compiler-rt/Makefile
+++ runtime/compiler-rt/Makefile
@@ -89,8 +89,10 @@
 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 \


Index: runtime/compiler-rt/Makefile
===
--- runtime/compiler-rt/Makefile
+++ runtime/compiler-rt/Makefile
@@ -89,8 +89,10 @@
 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 \
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


Re: [PATCH] D13421: Fix makefile build on OSX when ARM targets are not enabled

2015-10-04 Thread Chris Bieneman via cfe-commits
beanz accepted this revision.
beanz added a comment.
This revision is now accepted and ready to land.

LGTM.

Thanks for catching this!

-Chris


Repository:
  rL LLVM

http://reviews.llvm.org/D13421



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


Re: [PATCH] D13421: Fix makefile build on OSX when ARM targets are not enabled

2015-10-04 Thread Phabricator via cfe-commits
This revision was automatically updated to reflect the committed changes.
Closed by commit rL249281: Fix makefile build on OSX when ARM targets are not 
enabled (authored by kfischer).

Changed prior to commit:
  http://reviews.llvm.org/D13421?vs=36462=36473#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D13421

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

Index: cfe/trunk/runtime/compiler-rt/Makefile
===
--- cfe/trunk/runtime/compiler-rt/Makefile
+++ cfe/trunk/runtime/compiler-rt/Makefile
@@ -89,8 +89,10 @@
 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 \


Index: cfe/trunk/runtime/compiler-rt/Makefile
===
--- cfe/trunk/runtime/compiler-rt/Makefile
+++ cfe/trunk/runtime/compiler-rt/Makefile
@@ -89,8 +89,10 @@
 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 \
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits