Skip to content

Commit 4d812ba

Browse files
Update native_cctools.mk
1 parent e41d1b1 commit 4d812ba

1 file changed

Lines changed: 23 additions & 12 deletions

File tree

depends/packages/native_cctools.mk

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@ $(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+
78
$(package)_clang_version=3.7.1
89
$(package)_clang_download_path=http://llvm.org/releases/$($(package)_clang_version)
910
$(package)_clang_download_file=clang+llvm-$($(package)_clang_version)-x86_64-linux-gnu-ubuntu-14.04.tar.xz
1011
$(package)_clang_file_name=clang-llvm-$($(package)_clang_version)-x86_64-linux-gnu-ubuntu-14.04.tar.xz
1112
$(package)_clang_sha256_hash=99b28a6b48e793705228a390471991386daa33a9717cd9ca007fcdde69608fd9
13+
1214
$(package)_extra_sources=$($(package)_clang_file_name)
1315

1416
define $(package)_fetch_cmds
15-
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \
16-
$(call fetch_file,$(package),$($(package)_clang_download_path),$($(package)_clang_download_file),$($(package)_clang_file_name),$($(package)_clang_sha256_hash))
17+
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \
18+
$(call fetch_file,$(package),$($(package)_clang_download_path),$($(package)_clang_download_file),$($(package)_clang_file_name),$($(package)_clang_sha256_hash))
1719
endef
1820

1921
define $(package)_extract_cmds
@@ -30,25 +32,34 @@ define $(package)_extract_cmds
3032
tar --strip-components=1 -xf $($(package)_source)
3133
endef
3234

35+
# ====================================================================
36+
# FINAL FIX — CORRECT OVERRIDE LOCATION
37+
# macOS cross-compile uses GCC/G++, not LLVM 3.7.1 (broken)
38+
# ====================================================================
3339
define $(package)_set_vars
3440
$(package)_config_opts=--target=$(host) --disable-lto-support
3541
$(package)_ldflags+=-Wl,-rpath=\\$$$$$$$$\$$$$$$$$ORIGIN/../lib
42+
43+
# ----------------------------
44+
# Default (Linux / Windows)
45+
# ----------------------------
3646
$(package)_cc=$($(package)_extract_dir)/toolchain/bin/clang
3747
$(package)_cxx=$($(package)_extract_dir)/toolchain/bin/clang++
38-
endef
3948

49+
# ----------------------------
50+
# macOS cross-compile override
51+
# ----------------------------
52+
ifeq ($(host_os),darwin)
53+
$(package)_cc=gcc
54+
$(package)_cxx=g++
4055

41-
# ==================================================================
42-
# FIX: Override compiler BEFORE preprocess/configure (NO RECIPES HERE)
43-
# ==================================================================
44-
ifeq ($(findstring darwin,$(host_os)),darwin)
45-
$(package)_cc=gcc
46-
$(package)_cxx=g++
47-
$(package)_cflags+=-Wno-unused-command-line-argument
48-
$(package)_cxxflags+=-Wno-unused-command-line-argument
49-
$(package)_ldflags+=-Wno-unused-command-line-argument
56+
# Silence warnings that break the configure step
57+
$(package)_cflags+=-Wno-unused-command-line-argument
58+
$(package)_cxxflags+=-Wno-unused-command-line-argument
59+
$(package)_ldflags+=-Wno-unused-command-line-argument
5060
endif
5161

62+
endef
5263

5364
define $(package)_preprocess_cmds
5465
cd $($(package)_build_subdir); ./autogen.sh && \

0 commit comments

Comments
 (0)