diff options
| author | Andy Gibbs <andyg1001@hotmail.co.uk> | 2015-12-02 13:46:56 +0000 |
|---|---|---|
| committer | Andy Gibbs <andyg1001@hotmail.co.uk> | 2015-12-02 13:46:56 +0000 |
| commit | abd2a0bf0df18f20d0c55fbde5822a3c9f1445d8 (patch) | |
| tree | b421a09b96a02c3e5490b5308e6fb78e425ddbfd | |
| parent | f47be098c62346ed7f5583c0eb00fd1af670f053 (diff) | |
| download | bcm5719-llvm-abd2a0bf0df18f20d0c55fbde5822a3c9f1445d8.tar.gz bcm5719-llvm-abd2a0bf0df18f20d0c55fbde5822a3c9f1445d8.zip | |
Pass along correct 'make' to sub-builds.
If the top-level cmake has a custom make specified through -DCMAKE_MAKE_PROGRAM
then this must be passed along to the sub-build processes in compiler-rt or the
build process will fail.
llvm-svn: 254509
| -rw-r--r-- | compiler-rt/cmake/Modules/AddCompilerRT.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake index 284cf1de70d..cee0af935e9 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -284,7 +284,8 @@ macro(add_custom_libcxx name prefix) ExternalProject_Add(${name} PREFIX ${prefix} SOURCE_DIR ${COMPILER_RT_LIBCXX_PATH} - CMAKE_ARGS -DCMAKE_C_COMPILER=${COMPILER_RT_TEST_COMPILER} + CMAKE_ARGS -DCMAKE_MAKE_PROGRAM:STRING=${CMAKE_MAKE_PROGRAM} + -DCMAKE_C_COMPILER=${COMPILER_RT_TEST_COMPILER} -DCMAKE_CXX_COMPILER=${COMPILER_RT_TEST_COMPILER} -DCMAKE_C_FLAGS=${LIBCXX_CFLAGS} -DCMAKE_CXX_FLAGS=${LIBCXX_CFLAGS} |
