From 9b2e391303cef5ab040f232ee7b26dfb5914fc01 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Wed, 25 Sep 2019 09:20:22 -0700
Subject: [PATCH] build: add support for new build layout for libdispatch

Stage the changes needed in the include path for libdispatch with the
new CMake support.
---
 CMakeLists.txt           | 1 +
 Tests/Functional/lit.cfg | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2af40c2d0..16cd3eda3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,6 +98,7 @@ add_swift_library(XCTest
 
                     -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 47c9013b1..a00ddca94 100644
--- a/Tests/Functional/lit.cfg
+++ b/Tests/Functional/lit.cfg
@@ -94,6 +94,7 @@ else:
                 '-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'),
             ])