Skip to content

Commit

Permalink
[apple] workaround the swift-ci linux failure for PR bots
Browse files Browse the repository at this point in the history
The swift-ci linux PR bot is failing because it's not able
to build libcxx fuzzer becuase of missing libcxxabi. It shouldn't
even build the fuzzer, it only tries to because of the monorepo, which
has libcxxabi next to compiler-rt.
  • Loading branch information
hyp committed Oct 18, 2019
1 parent 04acb60 commit 57755b1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion compiler-rt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down

2 comments on commit 57755b1

@dexonsmith
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hyp, I feel like the right fix would be to only include "../libcxxabi" if LLVM_ENABLE_PROJECTS has libcxxabi in it.

@hyp
Copy link
Author

@hyp hyp commented on 57755b1 Oct 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hyp, I feel like the right fix would be to only include "../libcxxabi" if LLVM_ENABLE_PROJECTS has libcxxabi in it.

Yes, that's probably a right upstream fix on ToT.

Please sign in to comment.