Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
Merge pull request #124 from nodejs/osx_10_12
Browse files Browse the repository at this point in the history
chakrashim: OSX SDK 10.12 support
  • Loading branch information
obastemur authored Sep 26, 2016
2 parents bd17a62 + 33c055d commit cecbc36
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions deps/chakrashim/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
else()
clr_unknown_arch()
endif()
# OSX 10.12 Clang deprecates libstdc++ [See GH #1599]
# So, -Werror is linux only for now
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
-Werror"
)
set(CLR_CMAKE_PLATFORM_LINUX 1)
elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
add_definitions(
Expand Down Expand Up @@ -136,15 +141,6 @@ if(CLR_CMAKE_PLATFORM_UNIX)
# prevent the required interface is being exported
# clang by default sets fvisibility=default

if(NOT CC_XCODE_PROJECT)
# todo: enable for XCode too
# XCode is a bit more strict
# keep this until we fix all the warnings there.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
-Werror"
)
endif()

# CXX WARNING FLAGS
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
-Wno-deprecated-declarations\
Expand Down

0 comments on commit cecbc36

Please sign in to comment.