Skip to content

Commit 1de8c06

Browse files
fanquaketheuni
andcommitted
depends: clang 6.0.1
This also removes some now-unnecessary cctools hacks. Co-Authored-By: Cory Fields <[email protected]>
1 parent 651e343 commit 1de8c06

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

depends/packages/native_cctools.mk

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ $(package)_download_path=https://github.com/theuni/cctools-port/archive
44
$(package)_file_name=$($(package)_version).tar.gz
55
$(package)_sha256_hash=a09c9ba4684670a0375e42d9d67e7f12c1f62581a27f28f7c825d6d7032ccc6a
66
$(package)_build_subdir=cctools
7-
$(package)_clang_version=3.7.1
8-
$(package)_clang_download_path=https://llvm.org/releases/$($(package)_clang_version)
7+
$(package)_clang_version=6.0.1
8+
$(package)_clang_download_path=https://releases.llvm.org/$($(package)_clang_version)
99
$(package)_clang_download_file=clang+llvm-$($(package)_clang_version)-x86_64-linux-gnu-ubuntu-14.04.tar.xz
1010
$(package)_clang_file_name=clang-llvm-$($(package)_clang_version)-x86_64-linux-gnu-ubuntu-14.04.tar.xz
11-
$(package)_clang_sha256_hash=99b28a6b48e793705228a390471991386daa33a9717cd9ca007fcdde69608fd9
11+
$(package)_clang_sha256_hash=fa5416553ca94a8c071a27134c094a5fb736fe1bd0ecc5ef2d9bc02754e1bef0
1212
$(package)_extra_sources=$($(package)_clang_file_name)
1313

1414
define $(package)_fetch_cmds
@@ -21,12 +21,9 @@ define $(package)_extract_cmds
2121
echo "$($(package)_sha256_hash) $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
2222
echo "$($(package)_clang_sha256_hash) $($(package)_source_dir)/$($(package)_clang_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
2323
$(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
24-
mkdir -p toolchain/bin toolchain/lib/clang/3.5/include && \
24+
mkdir -p toolchain/bin toolchain/lib/clang/$($(package)_clang_version)/include && \
2525
tar --no-same-owner --strip-components=1 -C toolchain -xf $($(package)_source_dir)/$($(package)_clang_file_name) && \
2626
rm -f toolchain/lib/libc++abi.so* && \
27-
echo "#!/bin/sh" > toolchain/bin/$(host)-dsymutil && \
28-
echo "exit 0" >> toolchain/bin/$(host)-dsymutil && \
29-
chmod +x toolchain/bin/$(host)-dsymutil && \
3027
tar --no-same-owner --strip-components=1 -xf $($(package)_source)
3128
endef
3229

0 commit comments

Comments
 (0)