From 14086eae46a26c5d75d7712ea677e4b49e17546b Mon Sep 17 00:00:00 2001 From: Daniel Sanders Date: Thu, 21 Jul 2016 09:28:09 +0000 Subject: [PATCH] Attempt to fix clang-cmake-mips after r268977. I think it's wiped out the build area and fully-reconfigured for the first time since r268977. This seems to have caused Mips64 to become enabled when it wasn't before because compiling with -mabi=64 succeeds but linking with -mabi=64 fails. llvm-svn: 276256 --- compiler-rt/cmake/builtin-config-ix.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compiler-rt/cmake/builtin-config-ix.cmake b/compiler-rt/cmake/builtin-config-ix.cmake index 432b1fa..c4dc156 100644 --- a/compiler-rt/cmake/builtin-config-ix.cmake +++ b/compiler-rt/cmake/builtin-config-ix.cmake @@ -2,6 +2,12 @@ include(BuiltinTests) # Make all the tests only check the compiler set(TEST_COMPILE_ONLY On) +# Temporary fix for Mips buildbots this broke. It's the linker that rejects +# inappropriate multilibs on this system. +check_compile_definition("__mips__" "" IS_MIPS_HOST) +if(IS_MIPS_HOST) + set(TEST_COMPILE_ONLY OFF) +endif() builtin_check_c_compiler_flag(-fPIC COMPILER_RT_HAS_FPIC_FLAG) builtin_check_c_compiler_flag(-fPIE COMPILER_RT_HAS_FPIE_FLAG) -- 2.7.4