Attachment #685095 for bug #767844

View | Details | Raw Unified | Return to bug 767844
Collapse All | Expand All

Lines 444-453 Link Here

(-)cmake/config-ix.cmake.ORIG (-4 / +1 lines)
444	${DARWIN_COMMON_LINK_FLAGS}	444	${DARWIN_COMMON_LINK_FLAGS}
445	${DARWIN_osx_MIN_VER_FLAG}=${SANITIZER_MIN_OSX_VERSION})	445	${DARWIN_osx_MIN_VER_FLAG}=${SANITIZER_MIN_OSX_VERSION})
446		446
447	if(DARWIN_osx_SYSROOT)	447	# Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
448	list(APPEND DARWIN_osx_CFLAGS -isysroot ${DARWIN_osx_SYSROOT})
449	list(APPEND DARWIN_osx_LINK_FLAGS -isysroot ${DARWIN_osx_SYSROOT})
450	endif()
451		448
452	# Figure out which arches to use for each OS	449	# Figure out which arches to use for each OS
453	darwin_get_toolchain_supported_archs(toolchain_arches)	450	darwin_get_toolchain_supported_archs(toolchain_arches)




endif()

if(APPLE)
  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
  set(OSX_SYSROOT_FLAG "")
  # the case, we need to find the OS X sysroot to pass to clang.
  if(NOT EXISTS /usr/include/c++)
    execute_process(COMMAND xcrun -sdk macosx --show-sdk-path
       OUTPUT_VARIABLE OSX_SYSROOT
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE)
    if (NOT OSX_SYSROOT OR NOT EXISTS ${OSX_SYSROOT})
      message(WARNING "Detected OSX_SYSROOT ${OSX_SYSROOT} does not exist")
    else()
      message(STATUS "Found OSX_SYSROOT: ${OSX_SYSROOT}")
      set(OSX_SYSROOT_FLAG "-isysroot${OSX_SYSROOT}")
    endif()
  else()
    set(OSX_SYSROOT_FLAG "")
  endif()

  option(COMPILER_RT_ENABLE_IOS "Enable building for iOS" On)
  option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS - Experimental" Off)

Lines 273-279 Link Here

(-)cmake/Modules/CompilerRTDarwinUtils.cmake.ORIG (-1 / +2 lines)
273	${ARGN})	273	${ARGN})
274	set(libname "${name}.${suffix}_${LIB_ARCH}_${LIB_OS}")	274	set(libname "${name}.${suffix}_${LIB_ARCH}_${LIB_OS}")
275	add_library(${libname} STATIC ${LIB_SOURCES})	275	add_library(${libname} STATIC ${LIB_SOURCES})
276	if(DARWIN_${LIB_OS}_SYSROOT)	276	# Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
		277	if(DARWIN_${LIB_OS}_SYSROOT AND NOT "${LIB_OS}" STREQUAL "osx")
277	set(sysroot_flag -isysroot ${DARWIN_${LIB_OS}_SYSROOT})	278	set(sysroot_flag -isysroot ${DARWIN_${LIB_OS}_SYSROOT})
278	endif()	279	endif()
279		280

Lines 278-284 Link Here

(-)cmake/Modules/AddCompilerRT.cmake.ORIG (-1 / +2 lines)
278	if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET)	278	if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET)
279	list(APPEND extra_cflags_${libname} "--target=${CMAKE_C_COMPILER_TARGET}")	279	list(APPEND extra_cflags_${libname} "--target=${CMAKE_C_COMPILER_TARGET}")
280	endif()	280	endif()
281	if(CMAKE_SYSROOT)	281	# Do not add --sysroot flag on Gentoo Prefix (search paths handled by cmake)
		282	if(CMAKE_SYSROOT AND NOT APPLE)
282	list(APPEND extra_cflags_${libname} "--sysroot=${CMAKE_SYSROOT}")	283	list(APPEND extra_cflags_${libname} "--sysroot=${CMAKE_SYSROOT}")
283	endif()	284	endif()
284	string(REPLACE ";" " " extra_cflags_${libname} "${extra_cflags_${libname}}")	285	string(REPLACE ";" " " extra_cflags_${libname} "${extra_cflags_${libname}}")

Return to bug 767844

Lines 101-123 Link Here

(-)cmake/base-config-ix.cmakeORIG (-17 / +2 lines)
101	endif()	101	endif()
102		102
103	if(APPLE)	103	if(APPLE)
104	# On Darwin if /usr/include/c++ doesn't exist, the user probably has Xcode but	104	# Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
105	# not the command line tools (or is using macOS 10.14 or newer). If this is	105	set(OSX_SYSROOT_FLAG "")
106	# the case, we need to find the OS X sysroot to pass to clang.
107	if(NOT EXISTS /usr/include/c++)
108	execute_process(COMMAND xcrun -sdk macosx --show-sdk-path
109	OUTPUT_VARIABLE OSX_SYSROOT
110	ERROR_QUIET
111	OUTPUT_STRIP_TRAILING_WHITESPACE)
112	if (NOT OSX_SYSROOT OR NOT EXISTS ${OSX_SYSROOT})
113	message(WARNING "Detected OSX_SYSROOT ${OSX_SYSROOT} does not exist")
114	else()
115	message(STATUS "Found OSX_SYSROOT: ${OSX_SYSROOT}")
116	set(OSX_SYSROOT_FLAG "-isysroot${OSX_SYSROOT}")
117	endif()
118	else()
119	set(OSX_SYSROOT_FLAG "")
120	endif()
121		106
122	option(COMPILER_RT_ENABLE_IOS "Enable building for iOS" On)	107	option(COMPILER_RT_ENABLE_IOS "Enable building for iOS" On)
123	option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS - Experimental" Off)	108	option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS - Experimental" Off)