[SR-11164] indexstore-db is using the system Block.h instead of the dispatch-bundled one

[kevints]

Previous ID	SR-11164
Radar	None
Original Reporter	@kevints
Type	Bug
Status	Resolved
Resolution	Done

Additional Detail from JIRA

Votes	0
Component/s	SourceKit-LSP
Labels	Bug
Assignee	@benlangmuir
Priority	Medium

md5: 5bfefb858f06706145adf59bed6e941b

Issue Description:

On a Linux system without a blocksruntime package installed, indexstore-db fails to build, despite pointing its include path to the installed headers. This is because the Block.h header is installed as /usr/lib/swift/Block/Block.h and it is including it as Block.h.

/code/swift-nightly-install/usr/bin/clang -target x86_64-unknown-linux --sysroot / -fPIC -O2 -DSWIFT_PACKAGE=1 -fblocks -fmodules -fmodule-name=IndexStoreDB_LLVMSupport -I /code/indexstore-db/lib/LLVMSupport/include -fmodules-cache-path=/code/build/buildbot_linux/indexstoredb-linux-x86_64/x86_64-unknown-linux/release/ModuleCache -I /code/swift-nightly-install/usr/lib/swift -MD -MT dependencies -MF /code/build/buildbot_linux/indexstoredb-linux-x86_64/x86_64-unknown-linux/release/IndexStoreDB_LLVMSupport.build/Support/circular_raw_ostream.cpp.d -std=c++11 -c /code/indexstore-db/lib/LLVMSupport/Support/circular_raw_ostream.cpp -o /code/build/buildbot_linux/indexstoredb-linux-x86_64/x86_64-unknown-linux/release/IndexStoreDB_LLVMSupport.build/Support/circular_raw_ostream.cpp.o
/code/indexstore-db/lib/Support/Concurrency-Mac.cpp:19:10: fatal error: 'Block.h' file not found
#include <Block.h>
         ^~~~~~~~~
1 error generated.

[benlangmuir]

The build command in the README (https://github.com/apple/indexstore-db) for Linux is

swift build -Xcxx -I<path_to_swift_toolchain>/usr/lib/swift -Xcxx -I<path_to_swift_toolchain>/usr/lib/swift/Block

That second -I path should take care of this.

[kevints]

@benlangmuir ah, the documentation is correct, but the build-script isn't. Filed swiftlang/indexstore-db#33