Skip to content

Commit 235a1f6

Browse files
committed
build: adjust for new build layout
Moving CoreFoundation into the root is needed to actually get the proper dependency tracking for Foundation builds. This adjusts the use of it in XCTest.
1 parent 27ecb23 commit 235a1f6

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ add_swift_library(XCTest
106106
-Xcc -fblocks
107107

108108
-I${XCTEST_PATH_TO_FOUNDATION_BUILD}/swift
109+
-Fsystem ${XCTEST_PATH_TO_FOUNDATION_BUILD}
109110
-Fsystem ${XCTEST_PATH_TO_COREFOUNDATION_BUILD}/System/Library/Frameworks
110111

111112
# compatibility with Foundation build_script.py

Tests/Functional/lit.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ else:
8585
'-L', foundation_dir,
8686
'-I', foundation_dir,
8787
'-I', os.path.join(foundation_dir, 'swift'),
88+
'-Xcc', '-F', '-Xcc', foundation_dir,
89+
8890
'-I', core_foundation_dir,
8991
'-Xcc', '-F', '-Xcc', os.path.join(core_foundation_dir, 'System', 'Library', 'Frameworks'),
9092
])

0 commit comments

Comments
 (0)