replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[CMake] [macho_embedded] Only set sys root if the variable is set, this prevents passing empty -isysroot arguments 

This is a minor cleanup to the macho_embedded builtins.

llvm-svn: 252619
This commit is contained in:
Chris Bieneman 2015-11-10 17:26:40 +00:00
parent 9a6afeb84d
commit 45c40fff66
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
View File

@ -161,8 +161,11 @@ macro(darwin_add_builtin_library name suffix)
${ARGN}) ${ARGN})
set(libname "${name}.${suffix}_${LIB_ARCH}_${LIB_OS}") set(libname "${name}.${suffix}_${LIB_ARCH}_${LIB_OS}")
add_library(${libname} STATIC ${LIB_SOURCES}) add_library(${libname} STATIC ${LIB_SOURCES})
if(DARWIN_${LIB_OS}_SYSROOT)
set(sysroot_flag -isysroot ${DARWIN_${LIB_OS}_SYSROOT})
endif()
set_target_compile_flags(${libname} set_target_compile_flags(${libname}
-isysroot ${DARWIN_${LIB_OS}_SYSROOT} ${sysroot_flag}
${DARWIN_${LIB_OS}_BUILTIN_MIN_VER_FLAG} ${DARWIN_${LIB_OS}_BUILTIN_MIN_VER_FLAG}
${LIB_CFLAGS}) ${LIB_CFLAGS})
set_property(TARGET ${libname} APPEND PROPERTY set_property(TARGET ${libname} APPEND PROPERTY
@ -409,6 +412,7 @@ macro(darwin_add_embedded_builtin_libraries)
set(float_flag) set(float_flag)
if(${arch} MATCHES "^arm") if(${arch} MATCHES "^arm")
set(DARWIN_macho_embedded_SYSROOT ${DARWIN_ios_SYSROOT}) set(DARWIN_macho_embedded_SYSROOT ${DARWIN_ios_SYSROOT})
set(DARWIN_macho_embedded_BUILTIN_MIN_VER_FLAG ${DARWIN_ios_BUILTIN_MIN_VER_FLAG})
# x86 targets are hard float by default, but the complain about the # x86 targets are hard float by default, but the complain about the
# float ABI flag, so don't pass it unless we're targeting arm. # float ABI flag, so don't pass it unless we're targeting arm.
set(float_flag ${${float_type}_FLOAT_FLAG}) set(float_flag ${${float_type}_FLOAT_FLAG})