this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Move macOS version flag to non-native build section

Now the flag is only set for targets being built for the Darling environment, not those being built to run natively.

Fixes #1064

+5 -5
-5
CMakeLists.txt
··· 86 86 SET(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb") 87 87 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb") 88 88 89 - # set macOS deployment version 90 - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") 91 - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") 92 - set(CMAKE_OBJC_FLAGS "${CMAKE_OBJC_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") 93 - 94 89 # prevent object filename conflicts for two source files that differ only in extension (e.g. `object.c` and `object.m`) 95 90 set(CMAKE_C_OUTPUT_EXTENSION ".c.o") 96 91 set(CMAKE_CXX_OUTPUT_EXTENSION ".cpp.o")
+5
src/CMakeLists.txt
··· 74 74 set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/${APPLE_TARGET_TRIPLET_PRIMARY}-ranlib") 75 75 #set(CMAKE_ASM_COMPILER "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/as/${APPLE_TARGET_TRIPLET_PRIMARY}-as") 76 76 77 + # set macOS deployment version 78 + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") 79 + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") 80 + set(CMAKE_OBJC_FLAGS "${CMAKE_OBJC_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") 81 + 77 82 add_definitions(-target ${APPLE_TARGET_TRIPLET_PRIMARY}) 78 83 include(darling_lib) 79 84 include(darling_static_lib)