Use correct flag to set make program in CMake
Furthemore, use prebuilt toolchain as a host compiler.
Change-Id: If910104e9dc30106a7e66c29568d0b7bce800cf3
diff --git a/recipes/clang_toolchain.expected/linux.json b/recipes/clang_toolchain.expected/linux.json
index 66e8c28..9a84564 100644
--- a/recipes/clang_toolchain.expected/linux.json
+++ b/recipes/clang_toolchain.expected/linux.json
@@ -327,7 +327,10 @@
"cmd": [
"[START_DIR]/cipd/bin/cmake",
"-GNinja",
- "-DCMAKE_BUILD_PROGRAM=[START_DIR]/cipd/ninja",
+ "-DCMAKE_C_COMPILER=[START_DIR]/buildtools/toolchain/clang+llvm-x86_64-linux/bin/clang",
+ "-DCMAKE_CXX_COMPILER=[START_DIR]/buildtools/toolchain/clang+llvm-x86_64-linux/bin/clang++",
+ "-DCMAKE_ASM_COMPILER=[START_DIR]/buildtools/toolchain/clang+llvm-x86_64-linux/bin/clang",
+ "-DCMAKE_MAKE_PROGRAM=[START_DIR]/cipd/ninja",
"-DCMAKE_INSTALL_PREFIX=",
"-DFUCHSIA_SYSROOT=[START_DIR]/magenta/build-magenta-pc-x86-64/sysroot",
"-C",
diff --git a/recipes/clang_toolchain.expected/linux_new.json b/recipes/clang_toolchain.expected/linux_new.json
index 065ae19..d7e38df 100644
--- a/recipes/clang_toolchain.expected/linux_new.json
+++ b/recipes/clang_toolchain.expected/linux_new.json
@@ -327,7 +327,10 @@
"cmd": [
"[START_DIR]/cipd/bin/cmake",
"-GNinja",
- "-DCMAKE_BUILD_PROGRAM=[START_DIR]/cipd/ninja",
+ "-DCMAKE_C_COMPILER=[START_DIR]/buildtools/toolchain/clang+llvm-x86_64-linux/bin/clang",
+ "-DCMAKE_CXX_COMPILER=[START_DIR]/buildtools/toolchain/clang+llvm-x86_64-linux/bin/clang++",
+ "-DCMAKE_ASM_COMPILER=[START_DIR]/buildtools/toolchain/clang+llvm-x86_64-linux/bin/clang",
+ "-DCMAKE_MAKE_PROGRAM=[START_DIR]/cipd/ninja",
"-DCMAKE_INSTALL_PREFIX=",
"-DFUCHSIA_SYSROOT=[START_DIR]/magenta/build-magenta-pc-x86-64/sysroot",
"-C",
diff --git a/recipes/clang_toolchain.expected/mac.json b/recipes/clang_toolchain.expected/mac.json
index 41d91b7..8a99ae6 100644
--- a/recipes/clang_toolchain.expected/mac.json
+++ b/recipes/clang_toolchain.expected/mac.json
@@ -327,7 +327,10 @@
"cmd": [
"[START_DIR]/cipd/bin/cmake",
"-GNinja",
- "-DCMAKE_BUILD_PROGRAM=[START_DIR]/cipd/ninja",
+ "-DCMAKE_C_COMPILER=[START_DIR]/buildtools/toolchain/clang+llvm-x86_64-darwin/bin/clang",
+ "-DCMAKE_CXX_COMPILER=[START_DIR]/buildtools/toolchain/clang+llvm-x86_64-darwin/bin/clang++",
+ "-DCMAKE_ASM_COMPILER=[START_DIR]/buildtools/toolchain/clang+llvm-x86_64-darwin/bin/clang",
+ "-DCMAKE_MAKE_PROGRAM=[START_DIR]/cipd/ninja",
"-DCMAKE_INSTALL_PREFIX=",
"-DFUCHSIA_SYSROOT=[START_DIR]/magenta/build-magenta-pc-x86-64/sysroot",
"-C",
diff --git a/recipes/clang_toolchain.expected/mac_new.json b/recipes/clang_toolchain.expected/mac_new.json
index fc58138..5fa1aca 100644
--- a/recipes/clang_toolchain.expected/mac_new.json
+++ b/recipes/clang_toolchain.expected/mac_new.json
@@ -327,7 +327,10 @@
"cmd": [
"[START_DIR]/cipd/bin/cmake",
"-GNinja",
- "-DCMAKE_BUILD_PROGRAM=[START_DIR]/cipd/ninja",
+ "-DCMAKE_C_COMPILER=[START_DIR]/buildtools/toolchain/clang+llvm-x86_64-darwin/bin/clang",
+ "-DCMAKE_CXX_COMPILER=[START_DIR]/buildtools/toolchain/clang+llvm-x86_64-darwin/bin/clang++",
+ "-DCMAKE_ASM_COMPILER=[START_DIR]/buildtools/toolchain/clang+llvm-x86_64-darwin/bin/clang",
+ "-DCMAKE_MAKE_PROGRAM=[START_DIR]/cipd/ninja",
"-DCMAKE_INSTALL_PREFIX=",
"-DFUCHSIA_SYSROOT=[START_DIR]/magenta/build-magenta-pc-x86-64/sysroot",
"-C",
diff --git a/recipes/clang_toolchain.py b/recipes/clang_toolchain.py
index e8fda58..ceacfc3 100644
--- a/recipes/clang_toolchain.py
+++ b/recipes/clang_toolchain.py
@@ -129,11 +129,16 @@
build_dir = staging_dir.join('llvm_build_dir')
api.shutil.makedirs('create build dir', build_dir)
+ toolchain_dir = api.path['start_dir'].join('buildtools', 'toolchain')
+
with api.context(cwd=build_dir):
api.step('configure clang', [
cipd_dir.join('bin', 'cmake'),
'-GNinja',
- '-DCMAKE_BUILD_PROGRAM=%s' % cipd_dir.join('ninja'),
+ '-DCMAKE_C_COMPILER=%s' % toolchain_dir.join(pkg_name, 'bin', 'clang'),
+ '-DCMAKE_CXX_COMPILER=%s' % toolchain_dir.join(pkg_name, 'bin', 'clang++'),
+ '-DCMAKE_ASM_COMPILER=%s' % toolchain_dir.join(pkg_name, 'bin', 'clang'),
+ '-DCMAKE_MAKE_PROGRAM=%s' % cipd_dir.join('ninja'),
'-DCMAKE_INSTALL_PREFIX=',
'-DFUCHSIA_SYSROOT=%s' % magenta_dir.join('build-magenta-pc-x86-64', 'sysroot'),
'-C', clang_dir.join('cmake', 'caches', 'Fuchsia.cmake'),
