diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-12-26 14:16:15 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-12-26 14:17:36 +0100 |
| commit | 77b6c3cd06a679140fb5a44f81f904497007f333 (patch) | |
| tree | e8ed1606b326cdafba719cc2a14c527c1b601f2e /pkgs/development/tools/build-managers/bazel/bazel_rc.patch | |
| parent | 602bccd1a8262d4e6bd787838d21fc3c2c1c50ba (diff) | |
| parent | 4d2dd1554618831f0a5b159b8a4dff86612c02a9 (diff) | |
| download | nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.tar nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.tar.gz nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.tar.bz2 nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.tar.lz nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.tar.xz nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.tar.zst nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.zip | |
Merge remote-tracking branch 'origin/master' into gcc-9
Diffstat (limited to 'pkgs/development/tools/build-managers/bazel/bazel_rc.patch')
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/bazel_rc.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_rc.patch b/pkgs/development/tools/build-managers/bazel/bazel_rc.patch new file mode 100644 index 00000000000..a599ac3ec72 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_rc.patch @@ -0,0 +1,13 @@ +diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc +index 8f8f15685f..a7ae52d1e4 100644 +--- a/src/main/cpp/option_processor.cc ++++ b/src/main/cpp/option_processor.cc +@@ -56,7 +56,7 @@ OptionProcessor::OptionProcessor( + : workspace_layout_(workspace_layout), + startup_options_(std::move(default_startup_options)), + parse_options_called_(false), +- system_bazelrc_path_(BAZEL_SYSTEM_BAZELRC_PATH) {} ++ system_bazelrc_path_("@bazelSystemBazelRCPath@") {} + + OptionProcessor::OptionProcessor( + const WorkspaceLayout* workspace_layout, |