[zorg] r323967 - [zorg] Don't use -DCMAKE_C_COMPILER*/-DCMAKE_CXX_COMPILER*
Maxim Kuvyrkov via llvm-commits
llvm-commits at lists.llvm.org
Thu Feb 1 05:37:51 PST 2018
Author: maxim-kuvyrkov
Date: Thu Feb 1 05:37:51 2018
New Revision: 323967
URL: http://llvm.org/viewvc/llvm-project?rev=323967&view=rev
Log:
[zorg] Don't use -DCMAKE_C_COMPILER*/-DCMAKE_CXX_COMPILER*
Summary:
... to override host compiler. Two-stage builds set CMAKE_C_COMPILER/
CMAKE_CXX_COMPILER in the environment, and it is error-prone to override
it in both environment and command-line. We should rely on host
rootfs to provide correct cc/c++ in $PATH.
Reviewers: gkistanova, rovka
Reviewed By: rovka
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D42041
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=323967&r1=323966&r2=323967&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Feb 1 05:37:51 2018
@@ -212,9 +212,7 @@ def _get_clang_builders():
'--use-perf=all',
'--benchmarking-only', '--exec-multisample=3',
'--exclude-stat-from-submission=compile'],
- extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mthumb'",
"-DLLVM_TARGETS_TO_BUILD='ARM'",
"-DLLVM_PARALLEL_LINK_JOBS=2"],
@@ -234,9 +232,7 @@ def _get_clang_builders():
runTestSuite=True,
testsuite_flags=['--cppflags', '-mcpu=cortex-a15 -marm',
'--threads=4', '--build-threads=4'],
- extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM'",
"-DLLVM_PARALLEL_LINK_JOBS=2"])},
@@ -251,9 +247,7 @@ def _get_clang_builders():
checkout_lld=False,
useTwoStage=True,
testStage1=False,
- extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
"-DLLVM_LIT_ARGS='-sv -j2'",
@@ -267,9 +261,7 @@ def _get_clang_builders():
clean=False,
checkout_compiler_rt=False,
checkout_lld=False,
- extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
"-DLLVM_LIT_ARGS='-sv -j4'",
@@ -285,9 +277,7 @@ def _get_clang_builders():
checkout_lld=False,
useTwoStage=True,
testStage1=False,
- extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
"-DLLVM_LIT_ARGS='-sv -j4'",
@@ -306,9 +296,7 @@ def _get_clang_builders():
runTestSuite=True,
testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
'--threads=8', '--build-threads=8'],
- extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
)},
@@ -330,11 +318,7 @@ def _get_clang_builders():
testsuite_flags=['--cppflags',
'-mcpu=cortex-a57 -fuse-ld=lld',
'--threads=8', '--build-threads=8'],
- extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_C_COMPILER='clang'",
- "-DCMAKE_CXX_COMPILER='clang++'",
- "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'",
"-DLLVM_ENABLE_LLD=True"],
@@ -355,9 +339,7 @@ def _get_clang_builders():
testsuite_flags=['--cppflags',
'-mcpu=cortex-a57 -O0 -mllvm -global-isel -mllvm -global-isel-abort=0',
'--threads=8', '--build-threads=8'],
- extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
)},
@@ -1029,9 +1011,7 @@ def _get_sanitizer_builders():
'factory' : ClangBuilder.getClangCMakeBuildFactory(
clean=False,
checkout_lld=False,
- extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
@@ -1047,9 +1027,7 @@ def _get_sanitizer_builders():
checkout_lld=False,
useTwoStage=True,
testStage1=False,
- extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mthumb'",
"-DCOMPILER_RT_TEST_COMPILER_CFLAGS='-mcpu=cortex-a15 -mthumb'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
@@ -1070,9 +1048,7 @@ def _get_sanitizer_builders():
runTestSuite=True,
testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
'--threads=8', '--build-threads=8'],
- extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
- "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+ extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
)},
@@ -1331,11 +1307,7 @@ def _get_libcxx_builders():
'builddir': 'libcxx-libcxxabi-libunwind-arm-linux',
'category': 'libcxx',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
- cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
- 'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
- 'CMAKE_C_COMPILER': 'clang',
- 'CMAKE_CXX_COMPILER': 'clang++',
- 'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+ cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -marm',
'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -marm',
'LLVM_PARALLEL_LINK_JOBS': '2'})},
@@ -1345,11 +1317,7 @@ def _get_libcxx_builders():
'builddir': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
'category': 'libcxx',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
- cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
- 'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
- 'CMAKE_C_COMPILER': 'clang',
- 'CMAKE_CXX_COMPILER': 'clang++',
- 'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+ cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb',
@@ -1362,11 +1330,7 @@ def _get_libcxx_builders():
'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
'category': 'libcxx',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
- cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
- 'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
- 'CMAKE_C_COMPILER': 'clang',
- 'CMAKE_CXX_COMPILER': 'clang++',
- 'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+ cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
'CMAKE_C_FLAGS': '-mcpu=cortex-a57',
'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57',
'LLVM_PARALLEL_LINK_JOBS': '4'})},
@@ -1376,11 +1340,7 @@ def _get_libcxx_builders():
'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
'category': 'libcxx',
'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
- cmake_extra_opts={'CMAKE_C_COMPILER_LAUNCHER': 'ccache',
- 'CMAKE_CXX_COMPILER_LAUNCHER': 'ccache',
- 'CMAKE_C_COMPILER': 'clang',
- 'CMAKE_CXX_COMPILER': 'clang++',
- 'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+ cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
'CMAKE_C_FLAGS': '-mcpu=cortex-a57',
More information about the llvm-commits
mailing list