|
33 | 33 | define $(package)_set_vars |
34 | 34 | $(package)_config_opts=--target=$(host) --disable-lto-support |
35 | 35 | $(package)_ldflags+=-Wl,-rpath=\\$$$$$$$$\$$$$$$$$ORIGIN/../lib |
| 36 | + |
| 37 | +# default (non-darwin) – keep original behaviour |
36 | 38 | $(package)_cc=$($(package)_extract_dir)/toolchain/bin/clang |
37 | 39 | $(package)_cxx=$($(package)_extract_dir)/toolchain/bin/clang++ |
38 | 40 | endef |
@@ -65,17 +67,18 @@ define $(package)_stage_cmds |
65 | 67 | endef |
66 | 68 |
|
67 | 69 | # ============================================================ |
68 | | -# macOS-only overrides (safe, does NOT affect other platforms) |
| 70 | +# macOS toolchain build: override compiler for *this* package |
| 71 | +# Only hits HOST = x86_64-apple-darwin11, leaves Linux/Win alone |
69 | 72 | # ============================================================ |
70 | 73 | ifeq ($(host_os),darwin) |
71 | 74 |
|
72 | | -# Force REAL CC and CXX used by configure |
73 | | -CC=$(build_prefix)/native/bin/clang |
74 | | -CXX=$(build_prefix)/native/bin/clang++ |
| 75 | +# Use system GCC/G++ on the Linux runner to build cctools itself |
| 76 | +$(package)_cc=gcc |
| 77 | +$(package)_cxx=g++ |
75 | 78 |
|
76 | | -# Prevent ld64 / clang warnings from breaking the build |
77 | | -CFLAGS+= -Wno-unused-command-line-argument |
78 | | -CXXFLAGS+= -Wno-unused-command-line-argument |
79 | | -LDFLAGS+= -Wno-unused-command-line-argument |
| 79 | +# (Optional) keep warning noise down |
| 80 | +$(package)_cflags+= -Wno-unused-command-line-argument |
| 81 | +$(package)_cxxflags+= -Wno-unused-command-line-argument |
| 82 | +$(package)_ldflags+= -Wno-unused-command-line-argument |
80 | 83 |
|
81 | 84 | endif |
0 commit comments