[compiler-rt] r254509 - Pass along correct 'make' to sub-builds.

[Andy Gibbs via llvm-commits]

Hi,

I am aware that this patch *may* have broken a few buildbots.

I also committed another patch that totally broke *all* the buildbots (I'm
not having a good day!) and I am just waiting for the noise to diminish and
then I will look again at the breakages caused by this patch, if any remain.

Please bear with me for a little while :o)

Thanks
Andy


On Wednesday, December 02, 2015 2:46 PM, Andy Gibbs wrote:
> Author: andyg
> Date: Wed Dec  2 07:46:56 2015
> New Revision: 254509
>
> URL: http://llvm.org/viewvc/llvm-project?rev=254509&view=rev
> Log:
> 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.
>
> Modified:
>    compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake
>
> Modified: compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake
> URL: 
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake?rev=254509&r1=254508&r2=254509&view=diff
> ==============================================================================
> --- compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake (original)
> +++ compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake Wed Dec  2 
> 07:46:56 2015
> @@ -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}
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>