Skip to content

Commit a9df7d1

Browse files
authored
Merge pull request #70273 from apple/ignore-none-warning
[CMake] Ignore `None` and `NoneType` deprecations
2 parents 95eaeaf + cb29ec8 commit a9df7d1

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

SwiftCompilerSources/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function(add_swift_compiler_modules_library name)
103103
"-Xfrontend" "-enable-experimental-cxx-interop"
104104
"-Xfrontend" "-disable-target-os-checking"
105105
"-Xcc" "-std=c++17"
106-
"-Xcc" "-DCOMPILED_WITH_SWIFT"
106+
"-Xcc" "-DCOMPILED_WITH_SWIFT" "-Xcc" "-DSWIFT_TARGET"
107107
"-Xcc" "-UIBOutlet" "-Xcc" "-UIBAction" "-Xcc" "-UIBInspectable")
108108
if (NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
109109
list(APPEND swift_compile_options "-Xfrontend" "-disable-implicit-string-processing-module-import")
@@ -271,6 +271,7 @@ else()
271271
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/HeaderDependencies.cpp.tmp"
272272
"
273273
#define COMPILED_WITH_SWIFT
274+
#define SWIFT_TARGET
274275
275276
#include \"Basic/BasicBridging.h\"
276277
#include \"SIL/SILBridging.h\"

lib/ASTGen/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ endif()
102102
set(compile_options
103103
${c_include_paths_args}
104104
"SHELL: ${cxx_interop_flag}"
105-
"SHELL: -Xcc -std=c++17 -Xcc -DCOMPILED_WITH_SWIFT"
105+
"SHELL: -Xcc -std=c++17 -Xcc -DCOMPILED_WITH_SWIFT -Xcc -DSWIFT_TARGET"
106106

107107
# FIXME: Needed to work around an availability issue with CxxStdlib
108108
"SHELL: -Xfrontend -disable-target-os-checking"

0 commit comments

Comments
 (0)