mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
Merge pull request #82358 from AnthonyLatsis/no-warnings-asserts
[presets] Actually make https://github.com/swiftlang/swift/pull/81284 work
This commit is contained in:
@@ -824,6 +824,9 @@ elseif(UNIX)
|
|||||||
include(UnixCompileRules)
|
include(UnixCompileRules)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Add any extra C++ compilation options that were passed down.
|
||||||
|
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:${SWIFT_EXTRA_CXX_FLAGS}>)
|
||||||
|
|
||||||
if(CMAKE_C_COMPILER_ID MATCHES Clang)
|
if(CMAKE_C_COMPILER_ID MATCHES Clang)
|
||||||
add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror=gnu>)
|
add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror=gnu>)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -681,7 +681,7 @@ enable-new-runtime-build
|
|||||||
|
|
||||||
# Escalate certain C++ warnings to errors for Swift.
|
# Escalate certain C++ warnings to errors for Swift.
|
||||||
extra-swift-cmake-options=
|
extra-swift-cmake-options=
|
||||||
-DCMAKE_CXX_FLAGS="-Werror=unused"
|
-DSWIFT_EXTRA_CXX_FLAGS="-Werror=unused"
|
||||||
|
|
||||||
[preset: buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx,flto]
|
[preset: buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx,flto]
|
||||||
mixin-preset=buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx
|
mixin-preset=buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx
|
||||||
|
|||||||
Reference in New Issue
Block a user