Merge pull request #285 from apple/staging-paths
build: add support for new build layout for libdispatch
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2af40c2..16cd3ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,6 +98,7 @@
-I${XCTEST_PATH_TO_LIBDISPATCH_SOURCE}
-I${XCTEST_PATH_TO_LIBDISPATCH_BUILD}/src/swift
+ -I${XCTEST_PATH_TO_LIBDISPATCH_BUILD}/src/swift/swift
-Xcc -fblocks
-I${XCTEST_PATH_TO_FOUNDATION_BUILD}/swift
diff --git a/Tests/Functional/lit.cfg b/Tests/Functional/lit.cfg
index 47c9013..a00ddca 100644
--- a/Tests/Functional/lit.cfg
+++ b/Tests/Functional/lit.cfg
@@ -94,6 +94,7 @@
'-Xcc', '-fblocks',
'-I', libdispatch_src_dir,
'-I', libdispatch_overlay_dir,
+ '-I', os.path.join(libdispatch_overlay_dir, 'swift'),
'-L', libdispatch_build_dir,
'-L', os.path.join(libdispatch_build_dir, 'src'),
])
