Skip to content

Commit fe8295b

Browse files
authored
Merge pull request #73230 from rintaro/astgen-package-path
[ASTGen] Use Absolute paths for -I options
2 parents 3d93b5e + b278193 commit fe8295b

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

lib/ASTGen/Package.swift

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,22 @@
2020

2121
import PackageDescription
2222

23+
let swiftSourceDirectory = #filePath
24+
.split(separator: "/", omittingEmptySubsequences: false)
25+
.dropLast(3) // Remove 'lib', 'ASTGen', 'Package.swift'
26+
.joined(separator: "/")
27+
2328
let swiftSetttings: [SwiftSetting] = [
2429
.interoperabilityMode(.Cxx),
2530
.unsafeFlags([
2631
"-Xcc", "-DCOMPILED_WITH_SWIFT",
2732
"-Xcc", "-UIBOutlet", "-Xcc", "-UIBAction", "-Xcc", "-UIBInspectable",
28-
"-Xcc", "-I../../include",
29-
"-Xcc", "-I../../../llvm-project/llvm/include",
30-
"-Xcc", "-I../../../llvm-project/clang/include",
31-
"-Xcc", "-I../../../build/Default/swift/include",
32-
"-Xcc", "-I../../../build/Default/llvm/include",
33-
"-Xcc", "-I../../../build/Default/llvm/tools/clang/include",
33+
"-Xcc", "-I\(swiftSourceDirectory)/include",
34+
"-Xcc", "-I\(swiftSourceDirectory)/../llvm-project/llvm/include",
35+
"-Xcc", "-I\(swiftSourceDirectory)/../llvm-project/clang/include",
36+
"-Xcc", "-I\(swiftSourceDirectory)/../build/Default/swift/include",
37+
"-Xcc", "-I\(swiftSourceDirectory)/../build/Default/llvm/include",
38+
"-Xcc", "-I\(swiftSourceDirectory)/../build/Default/llvm/tools/clang/include",
3439

3540
// FIXME: Needed to work around an availability issue with CxxStdlib
3641
"-Xfrontend", "-disable-target-os-checking",

0 commit comments

Comments
 (0)