Merge remote-tracking branch 'origin/apple/stable/20190619' into swif…

…t/master
swiftlang · Oct 18, 2019 · 3bcca3a · 3bcca3a
2 parents f38eb5f + 57755b1
commit 3bcca3a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
@@ -476,7 +476,7 @@ if(COMPILER_RT_USE_LIBCXX)
   endforeach()
   foreach(path IN ITEMS ${LLVM_MAIN_SRC_DIR}/projects/libcxxabi
                         ${LLVM_MAIN_SRC_DIR}/runtimes/libcxxabi
-                        ${LLVM_MAIN_SRC_DIR}/../libcxxabi
+                        # Hide monorepo libcxxabi path for swift-ci: ${LLVM_MAIN_SRC_DIR}/../libcxxabi
                         ${LLVM_EXTERNAL_LIBCXXABI_SOURCE_DIR})
     if(IS_DIRECTORY ${path})
       set(COMPILER_RT_LIBCXXABI_PATH ${path})