Skip to content

Commit 9a1995a

Browse files
committed
[presets] Escalate C++ "unused" warnings in macOS smoke test
1 parent 921d6d8 commit 9a1995a

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ set(CMAKE_CXX_STANDARD ${SWIFT_MIN_CXX_STANDARD} CACHE STRING "C++ standard to c
8787
set(CMAKE_CXX_STANDARD_REQUIRED YES)
8888
set(CMAKE_CXX_EXTENSIONS NO)
8989

90+
# This is needed to allow to pass Swift-only C++ flags from `build-script`,
91+
# since `--swift-cmake-options` does not work as expected, and specifying
92+
# `CMAKE_CXX_FLAGS` to `--extra-cmake-options` would apply the setting to other
93+
# build products as well.
94+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SWIFT_CXX_FLAGS}")
95+
9096
# First include general CMake utilities.
9197
include(SwiftUtils)
9298
include(CheckSymbolExists)

utils/build-presets.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,10 @@ skip-test-llbuild
671671

672672
enable-new-runtime-build
673673

674+
# Escalate certain C++ warnings to errors for Swift.
675+
extra-cmake-options=
676+
-DSWIFT_CXX_FLAGS="-Werror=unused"
677+
674678
[preset: buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx,flto]
675679
mixin-preset=buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx
676680
build-subdir=buildbot_incremental

0 commit comments

Comments
 (0)