[benchmark] When building the benchmark suite via subcmake specify CLANG_EXEC.

gottesmm · gottesmm · commit 1914225e5832 · 2018-05-27T21:25:23.000-07:00
Given that we already know the clang that we want the benchmark suite to use,
just specify it explicitly.

rdar://40541972
diff --git a/cmake/modules/SwiftExternalBenchmarkBuild.cmake b/cmake/modules/SwiftExternalBenchmarkBuild.cmake
@@ -84,6 +84,7 @@ function (add_external_benchmark_suite)
       -DSWIFT_LIBRARY_PATH=${SWIFT_BINARY_DIR}/lib/swift
       -DCMAKE_C_COMPILER=${PATH_TO_CLANG_BUILD}/bin/clang
       -DCMAKE_CXX_COMPILER=${PATH_TO_CLANG_BUILD}/bin/clang++
+      -DCLANG_EXEC=${PATH_TO_CLANG_BUILD}/bin/clang
       -DSWIFT_BENCHMARK_SUBCMAKE_BUILD=TRUE
     PASSTHROUGH_PREFIXES SWIFT_BENCHMARK
     )

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ function (add_external_benchmark_suite)`
`84`	`84`	`-DSWIFT_LIBRARY_PATH=${SWIFT_BINARY_DIR}/lib/swift`
`85`	`85`	`-DCMAKE_C_COMPILER=${PATH_TO_CLANG_BUILD}/bin/clang`
`86`	`86`	`-DCMAKE_CXX_COMPILER=${PATH_TO_CLANG_BUILD}/bin/clang++`
	`87`	`+ -DCLANG_EXEC=${PATH_TO_CLANG_BUILD}/bin/clang`
`87`	`88`	`-DSWIFT_BENCHMARK_SUBCMAKE_BUILD=TRUE`
`88`	`89`	`PASSTHROUGH_PREFIXES SWIFT_BENCHMARK`
`89`	`90`	`)`