Adjust 'makeOptions' to new TableGen format of Swift's 'Options.inc'

swiftlang · Oct 26, 2023 · 432ff74 · 432ff74
1 parent 39151f6
commit 432ff74
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 48 deletions.
diff --git a/Package.swift b/Package.swift
@@ -129,9 +129,13 @@ let package = Package(
     /// The `makeOptions` utility (for importing option definitions).
     .executableTarget(
       name: "makeOptions",
-      dependencies: []),
+      dependencies: [],
+      // Do not enforce checks for LLVM's ABI-breaking build settings.
+      // makeOptions runtime uses some header-only code from LLVM's ADT classes,
+      // but we do not want to link libSupport into the executable.
+      cxxSettings: [.unsafeFlags(["-DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1"])]),
   ],
-  cxxLanguageStandard: .cxx14
+  cxxLanguageStandard: .cxx17
 )
 
 if ProcessInfo.processInfo.environment["SWIFT_DRIVER_LLBUILD_FWK"] == nil {

diff --git a/README.md b/README.md
@@ -156,7 +156,7 @@ $ apt-get install libncurses-dev
 be found, e.g.:
 
 ```
-$ swift build -Xcc -I/path/to/build/Ninja-ReleaseAssert/swift-.../include --product makeOptions
+$ swift build -Xcc -Xcc -I/path/to/build/Ninja-Release/swift-.../include -Xcc -I/path/to/build/Ninja-Release/llvm-.../include -Xcc -I/path/to/source/llvm-project/llvm/include --product makeOptions
 ```
 
 Then, run `makeOptions` and redirect the output to overwrite `Options.swift`: