diff options
| author |  Peter Schmitt <schmitt@google.com> | 2015-06-03 15:44:23 +0000 |
|---|---|---|
| committer |  Florian Weikert <fwe@google.com> | 2015-06-05 09:37:23 +0000 |
| commit | 21f2a492f24914f80ffbb6e46ce050760b2bdc96 (patch) | |
| tree | 5eec80f3781d3edcdc57e3ff34d1273bea6ba2a2 /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java | |
| parent | 9cb32754740058daceba58dfca84b2762f0ab9b4 (diff) | |
Allow objc_{library,binary} to depend on cc_library.
This is an early version of support for this feature, likely still missing
a number of edge cases. However the basic functionality should work.
To allow a dependency from objc to cc, the following flags will have to be
passed to bazel:
--experimental_enable_objc_cc_deps --cpu=ios_i386 --crosstool_top=//tools/objc/crosstool:crosstool
The feature is also compatible with --ios_multi_cpus, with the familiar
values for --ios_cpu (i386, x86_64, armv7, arm64; passed instead of --cpu
above).
This CL does not contain any Xcode support for CC dependencies yet, they
will just not show up in the generated Xcode project.
(Second submission after earlier accidental submit before this CL was ready).
--
MOS_MIGRATED_REVID=95110081
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java index 8342374937..dec8cc582c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java @@ -544,7 +544,8 @@ public class ObjcRuleClasses { "objc_import", "objc_framework", "objc_proto_library", - "j2objc_library"); + "j2objc_library", + "cc_library"); @Override public RuleClass build(Builder builder, RuleDefinitionEnvironment env) { |