diff options
| author |  Laszlo Csomor <laszlocsomor@google.com> | 2018-04-16 05:11:38 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-16 05:13:15 -0700 |
| commit | 81ed3add408adb20bddbc3ba1818c65806738dc5 (patch) | |
| tree | 885208ea7cf7da2b7091375f0d122fcd1e34488f /src/main | |
| parent | ecbab79b7bc982e5b60b09203607ab6a4d066294 (diff) | |
bash: Add a toolchain for local Bash.
Bazel automatically detects the local Bash and
creates a custom toolchain rule for it.
Later, rules that use Bash will require this
toolchain and retrieve Bash's path from it instead
of relying on hardcoded paths or the
`--shell_executable` flag.
See https://github.com/bazelbuild/bazel/issues/4319
Change-Id: Idd8242a20d202b1f5a56cddac95b625c6c08ede9
Closes #4980.
Change-Id: Ic2406a4da260b284e15852070d58472ca18340af
PiperOrigin-RevId: 193022708
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/sh/sh_configure.WORKSPACE | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java index 8594e6339c..865a521942 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java @@ -18,6 +18,7 @@ import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.bazel.rules.cpp.BazelCppRuleClasses; +import com.google.devtools.build.lib.bazel.rules.sh.BazelShRuleClasses; import com.google.devtools.build.lib.rules.cpp.FdoSupportFunction; import com.google.devtools.build.lib.rules.cpp.FdoSupportValue; import com.google.devtools.build.lib.runtime.BlazeModule; @@ -41,6 +42,8 @@ public class BazelRulesModule extends BlazeModule { ResourceFileLoader.loadResource(BazelCppRuleClasses.class, "cc_configure.WORKSPACE")); builder.addWorkspaceFileSuffix( ResourceFileLoader.loadResource(BazelRulesModule.class, "xcode_configure.WORKSPACE")); + builder.addWorkspaceFileSuffix( + ResourceFileLoader.loadResource(BazelShRuleClasses.class, "sh_configure.WORKSPACE")); } catch (IOException e) { throw new IllegalStateException(e); } diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/sh_configure.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/sh_configure.WORKSPACE new file mode 100644 index 0000000000..c41037cc76 --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/sh_configure.WORKSPACE @@ -0,0 +1,2 @@ +load("@bazel_tools//tools/sh:sh_configure.bzl", "sh_configure") +sh_configure() |