diff --git a/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.17.1/ubsan/CROSSTOOL b/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.17.1/ubsan/CROSSTOOL
index 0866dd1..79fc1ba 100755
--- a/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.17.1/ubsan/CROSSTOOL
+++ b/configs/experimental/ubuntu16_04_clang/1.1/bazel_0.17.1/ubsan/CROSSTOOL
@@ -904,7 +904,7 @@
     config_name: "c++-link-executable"
     action_name: "c++-link-executable"
     tool {
-      tool_path: "/usr/local/bin/clang"
+      tool_path: "/usr/local/bin/clang++"
     }
     implies: "symbol_counts"
     implies: "strip_debug_symbols"
@@ -924,7 +924,7 @@
     config_name: "c++-link-nodeps-dynamic-library"
     action_name: "c++-link-nodeps-dynamic-library"
     tool {
-      tool_path: "/usr/local/bin/clang"
+      tool_path: "/usr/local/bin/clang++"
     }
     implies: "symbol_counts"
     implies: "strip_debug_symbols"
@@ -944,7 +944,7 @@
     config_name: "c++-link-dynamic-library"
     action_name: "c++-link-dynamic-library"
     tool {
-      tool_path: "/usr/local/bin/clang"
+      tool_path: "/usr/local/bin/clang++"
     }
     implies: "symbol_counts"
     implies: "strip_debug_symbols"