Skip to content

Commit b5918c1

Browse files
authored
Merge pull request #215 from compnerd/compatibility
build: add compatibility with the build_script.py build
2 parents 70118c3 + bea14cf commit b5918c1

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ add_swift_library(XCTest
4747
LINK_FLAGS
4848
-L${XCTEST_PATH_TO_LIBDISPATCH_BUILD}/src -ldispatch
4949
-L${XCTEST_PATH_TO_FOUNDATION_BUILD} -lFoundation
50+
51+
# compatibility with Foundation build_script.py
52+
-L${XCTEST_PATH_TO_FOUNDATION_BUILD}/Foundation
5053
SOURCES
5154
Sources/XCTest/Private/WallClockTimeMetric.swift
5255
Sources/XCTest/Private/TestListing.swift
@@ -85,7 +88,11 @@ add_swift_library(XCTest
8588
-Xcc -fblocks
8689

8790
-I${XCTEST_PATH_TO_FOUNDATION_BUILD}/swift
88-
-Fsystem ${XCTEST_PATH_TO_COREFOUNDATION_BUILD}/System/Library/Frameworks)
91+
-Fsystem ${XCTEST_PATH_TO_COREFOUNDATION_BUILD}/System/Library/Frameworks
92+
93+
# compatibility with Foundation build_script.py
94+
-I${XCTEST_PATH_TO_FOUNDATION_BUILD}/Foundation
95+
-I${XCTEST_PATH_TO_FOUNDATION_BUILD}/Foundation/usr/lib/swift)
8996

9097
if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
9198
set(LIT_COMMAND "${PYTHON_EXECUTABLE};${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py"

0 commit comments

Comments
 (0)