Merge pull request #11377 from jamiesnape/fix-capture-cc

Fix //tools/cc_toolchain:capture_cc for Bazel 0.25
RobotLocomotion · May 6, 2019 · cf02601 · cf02601
2 parents fe0345c + 83be120
commit cf02601
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/common/test/drake_assert_test_compile_variants.sh b/common/test/drake_assert_test_compile_variants.sh
@@ -19,7 +19,7 @@ if [[ ! -e ./drake ]]; then
 fi
 
 # Confirm that it compiles successfully, whether or not assertions are enabled.
-TESTING_CXXFLAGS="-std=c++14 -I . \
+TESTING_CXXFLAGS="$BAZEL_CC_FLAGS -std=c++14 -I . \
     -c $drake_assert_test_compile_cc \
     -o /dev/null"
 "$BAZEL_CC" $TESTING_CXXFLAGS

diff --git a/tools/cc_toolchain/BUILD.bazel b/tools/cc_toolchain/BUILD.bazel
@@ -38,7 +38,11 @@ filegroup(
 genrule(
     name = "capture_cc",
     outs = ["capture_cc.env"],
-    cmd = "echo \"BAZEL_CC=$(CC)\" > '$@'",
+    cmd = "printf \"BAZEL_CC=$(CC)\nBAZEL_CC_FLAGS=$(CC_FLAGS)\n\" > '$@'",
+    toolchains = [
+        "@bazel_tools//tools/cpp:cc_flags",
+        "@bazel_tools//tools/cpp:current_cc_toolchain",
+    ],
     visibility = ["//common:__pkg__"],
 )