diff options
| author |  Dave MacLachlan <dmaclach@google.com> | 2015-11-05 18:40:47 +0000 |
|---|---|---|
| committer |  Florian Weikert <fwe@google.com> | 2015-11-06 16:39:39 +0000 |
| commit | 503b784b8fd86ba382ac7b9f4b2bef993a30d353 (patch) | |
| tree | 092cf5fc2931ee29e06606c52e3dfd081b093823 /src | |
| parent | baa22159f6d3f2b697cd6785df201805ed24096d (diff) | |
Fix up issue where plutil isn't always being found by xcrun due to a variety of factors including your PATH, the xcrun database and possibly the phase of the moon.
--
MOS_MIGRATED_REVID=107153778
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java index 3e192aeacc..9385885fd7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java @@ -316,9 +316,8 @@ final class BundleSupport { Artifact bundled = intermediateArtifacts.convertedStringsFile(strings); ruleContext.registerAction(ObjcRuleClasses.spawnOnDarwinActionBuilder(ruleContext) .setMnemonic("ConvertStringsPlist") - .setExecutable(XCRUN) + .setExecutable(new PathFragment("/usr/bin/plutil")) .setCommandLine(CustomCommandLine.builder() - .add("plutil") .add("-convert").add("binary1") .addExecPath("-o", bundled) .add("--") |