[PATCH 2/3] [zorg] Cleanup CC/CXX settings for Linaro Arm/AArch64 bots

[maxim-kuvyrkov]

Summary

Move settings from environment variables to CMAKE_* parameters.

[maxim-kuvyrkov]

Rebase after https://reviews.llvm.org/D40607 update

[rovka]

LGTM, thanks.

zorg/trunk/buildbot/osuosl/master/config/builders.py

return [
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       jobs=4,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=False,
                       useTwoStage=False,
                       runTestSuite=True,
-                      env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
                       testsuite_flags=['--cppflags', '-O3 -mcpu=cortex-a15 -mthumb',
                                 '--threads=1', '--build-threads=4',
                                 '--use-perf=all',
                                 '--benchmarking-only', '--exec-multisample=3',
                                 '--exclude-stat-from-submission=compile'],
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
+                      extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mthumb'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"],
                       submitURL='http://lnt.llvm.org/submitRun',
                       testerName='LNT-Thumb2v7-A15-O3')},
 
         # Cortex-A15 LNT test-suite in test-only mode
         {'name' : "clang-native-arm-lnt",
          'slavenames':["linaro-tk1-03"],
          'builddir':"clang-native-arm-lnt",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       jobs=4,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=False,
                       useTwoStage=False,
                       runTestSuite=True,
-                      env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a15 -marm',
                                        '--threads=4', '--build-threads=4'],
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
+                      extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -marm'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
         ## Cortex-A15 check-all self-host NEON with CMake builder
         {'name': "clang-cmake-armv7-a15-selfhost-neon",
          'slavenames':["linaro-tk1-04"],
          'builddir':"clang-cmake-armv7-a15-selfhost-neon",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       jobs=4,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       useTwoStage=True,
                       testStage1=False,
-                      env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-                           'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -marm'",
+                      env={'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
+                      extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+                                        "-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'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
         ## Cortex-A15 check-all with CMake builder
         {'name': "clang-cmake-armv7-a15",
          'slavenames':["linaro-tk1-06"],
          'builddir':"clang-cmake-armv7-a15",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       jobs=4,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
-                      env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+                      extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+                                        "-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'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
         ## Cortex-A15 check-all with CMake T2 builder
         {'name': "clang-cmake-thumbv7-a15",
          'slavenames':["linaro-tk1-09"],
          'builddir':"clang-cmake-thumbv7-a15",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       jobs=4,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
-                      env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -mthumb'",
+                      extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -mthumb'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -mthumb'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'",
                                         "-DLLVM_LIT_ARGS='-sv -j4'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
         ## Cortex-A15 check-all self-host with CMake builder
         {'name': "clang-cmake-armv7-a15-selfhost",
          'slavenames':["linaro-tk1-07"],
          'builddir':"clang-cmake-armv7-a15-selfhost",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       jobs=4,
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       useTwoStage=True,
                       testStage1=False,
-                      env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+                      extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+                                        "-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'",
                                         "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
         ## AArch64 Clang+LLVM check-all + test-suite
         {'name': "clang-cmake-aarch64-quick",
          'slavenames':["linaro-apm-01", "linaro-d05-01-quick"],
          'builddir':"clang-cmake-aarch64-quick",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
                                        '--threads=8', '--build-threads=8'],
-                      env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-                           'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+                      env={'BOTO_CONFIG':'/var/buildbot/llvmlab-build-artifacts.boto'},
+                      extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
                )},
 
         ## AArch64 Self-hosting Clang+LLVM check-all + LLD + test-suite
         ## TODO: Remove the X86 back-end after fixing the 90 bad tests
         ## TODO: Add Compiler-RT after fixing all the failures
         ## TODO: Fix the three remaining test-suite failures
         {'name': "clang-cmake-aarch64-lld",
          'slavenames':["linaro-apm-04", "linaro-d05-01-lld"],
          'builddir':"clang-cmake-aarch64-lld",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=True,
                       test=True,
                       useTwoStage=True,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags',
                                        '-mcpu=cortex-a57 -fuse-ld=lld',
                                        '--threads=8', '--build-threads=8'],
-                      env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+                      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'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'",
                                         "-DLLVM_ENABLE_LLD=True"],
                ),
          'category'   : 'lld'},
 
         ## AArch64 Clang+LLVM run test-suite with GlobalISel enabled
         {'name': "clang-cmake-aarch64-global-isel",
          'slavenames':["linaro-apm-06", "linaro-d05-01-global-isel"],
          'builddir':"clang-cmake-aarch64-global-isel",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=False,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags',
                                        '-mcpu=cortex-a57 -O0 -mllvm -global-isel -mllvm -global-isel-abort=0',
                                        '--threads=8', '--build-threads=8'],
-                      env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+                      extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
                )},
 
         {'name': 'clang-x86-windows-msvc2015',
          'slavenames': ['windows-gcebot2'],
          'builddir': 'clang-x86-windows-msvc2015',
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
def _get_sanitizer_builders():
           ## Cortex-A15 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests
           {'name': "clang-cmake-armv7-a15-full",
            'slavenames':["linaro-tk1-08"],
            'builddir':"clang-cmake-armv7-a15-full",
            'factory' : ClangBuilder.getClangCMakeBuildFactory(
                         jobs=4,
                         clean=False,
                         checkout_lld=False,
-                        env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
-                        extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3 -marm'",
+                        extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+                                          "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+                                          "-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'",
                                           "-DLLVM_LIT_ARGS='-sv -j4'",
                                           "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
           ## Cortex-A15 Thumb2 check-all full (compiler-rt) with CMake builder; Needs x86 for ASAN tests
           {'name': "clang-cmake-thumbv7-a15-full-sh",
            'slavenames':["linaro-tk1-05"],
            'builddir':"clang-cmake-thumbv7-a15-full-sh",
            'factory' : ClangBuilder.getClangCMakeBuildFactory(
                         jobs=4,
                         clean=False,
                         checkout_lld=False,
                         useTwoStage=True,
                         testStage1=False,
-                        env={'PATH':'/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
-                        extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a15 -mthumb'",
+                        extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+                                          "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+                                          "-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'",
                                           "-DLLVM_LIT_ARGS='-sv -j2'",
                                           "-DLLVM_PARALLEL_LINK_JOBS=2"])},
 
         # AArch64 Clang+LLVM+RT check-all + test-suite + self-hosting
         {'name': "clang-cmake-aarch64-full",
          'slavenames':["linaro-apm-02", "linaro-apm-05", "linaro-d05-01-full"],
          'builddir':"clang-cmake-aarch64-full",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=True,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=True,
                       testStage1=False,
                       runTestSuite=True,
                       testsuite_flags=['--cppflags', '-mcpu=cortex-a57',
                                        '--threads=8', '--build-threads=8'],
-                      env={'PATH':'/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
-                      extra_cmake_args=["-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
+                      extra_cmake_args=["-DCMAKE_C_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_CXX_COMPILER_LAUNCHER='ccache'",
+                                        "-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"],
                )},
 
           # Juno
           {'name' : "clang-native-aarch64-full",
            'slavenames' :["juno-aarch64-01"],
            'builddir':"clang-native-aarch64-full",
return [
         'category': 'libcxx'},
 
         # Cortex-A15 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-arm-linux',
          'slavenames': ['linaro-tk1-01'],
          'builddir': 'libcxx-libcxxabi-libunwind-arm-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            env={'CC': 'clang', 'CXX': 'clang++', 'PATH': '/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin'},
             # FIXME: there should be a way to merge autodetected with user-defined linker flags
             # See: libcxxabi/test/lit.cfg
             lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
-            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+            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_C_FLAGS': '-mcpu=cortex-a15 -marm',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -marm',
                               'LLVM_PARALLEL_LINK_JOBS': '2'})},
 
         {'name': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
          'slavenames': ['linaro-tk1-01'],
          'builddir': 'libcxx-libcxxabi-libunwind-arm-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            env={'CC': 'clang', 'CXX': 'clang++', 'PATH': '/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin'},
             # FIXME: there should be a way to merge autodetected with user-defined linker flags
             # See: libcxxabi/test/lit.cfg
             lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-armhf"'},
-            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+            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',
                               'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
                               'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
                               'CMAKE_C_FLAGS': '-mcpu=cortex-a15 -mthumb',
                               'CMAKE_CXX_FLAGS': '-mcpu=cortex-a15 -mthumb',
                               'LLVM_PARALLEL_LINK_JOBS': '2'})},
 
         # AArch64 LibC++ and LibC++abi tests (require Clang+RT)
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux',
          'slavenames': ['linaro-apm-03', 'linaro-d05-01-libcxx'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            # FIXME: CFLAGS / CXXFLAGS are here because cmake_extra_opts doesn't quote correctly
-            env={'CC': 'clang', 'CXX': 'clang++', 'CFLAGS': '-mcpu=cortex-a57', 'CXXFLAGS': '-mcpu=cortex-a57'},
             # FIXME: there should be a way to merge autodetected with user-defined linker flags
             # See: libcxxabi/test/lit.cfg
             lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-aarch64"'},
-            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+            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_C_FLAGS': '-mcpu=cortex-a57',
+                              'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57',
                               'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
         {'name': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
          'slavenames': ['linaro-apm-03', 'linaro-d05-01-libcxx-noexceptions'],
          'builddir': 'libcxx-libcxxabi-libunwind-aarch64-linux-noexceptions',
          'category': 'libcxx',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            # FIXME: CFLAGS / CXXFLAGS are here because cmake_extra_opts doesn't quote correctly
-            env={'CC': 'clang', 'CXX': 'clang++', 'CFLAGS': '-mcpu=cortex-a57', 'CXXFLAGS': '-mcpu=cortex-a57'},
             # FIXME: there should be a way to merge autodetected with user-defined linker flags
             # See: libcxxabi/test/lit.cfg
             lit_extra_opts={'link_flags': '"-lc++abi -lc -lm -lpthread -lunwind -ldl -L/opt/llvm/lib/clang/3.9.0/lib/linux -lclang_rt.builtins-aarch64"'},
-            cmake_extra_opts={'LIBCXXABI_USE_LLVM_UNWINDER': 'ON',
+            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',
                               'LIBCXX_ENABLE_EXCEPTIONS': 'OFF',
                               'LIBCXXABI_ENABLE_EXCEPTIONS': 'OFF',
+                              'CMAKE_C_FLAGS': '-mcpu=cortex-a57',
+                              'CMAKE_CXX_FLAGS': '-mcpu=cortex-a57',
                               'LLVM_PARALLEL_LINK_JOBS': '4'})},
 
     ]
 
 # Experimental and stopped builders
 def _get_on_demand_builders():
     return [
         ]