@@ -5,6 +5,10 @@ $(package)_file_name=$($(package)_version).tar.gz
55$(package)_sha256_hash =a09c9ba4684670a0375e42d9d67e7f12c1f62581a27f28f7c825d6d7032ccc6a
66$(package)_build_subdir =cctools
77
8+ # === NEW: Proper dependency ===
9+ $(package)_deps =native_libobjc2
10+
11+ # LLVM/Clang bundle for cctools
812$(package)_clang_version =3.7.1
913$(package)_clang_download_path =http://llvm.org/releases/$($(package ) _clang_version)
1014$(package)_clang_download_file =clang+llvm-$($(package ) _clang_version) -x86_64-linux-gnu-ubuntu-14.04.tar.xz
@@ -32,13 +36,22 @@ define $(package)_extract_cmds
3236 tar --strip-components=1 -xf $($(package)_source)
3337endef
3438
39+ # ## ======================================
40+ # ## CONFIG VARS — UPDATED FOR libobjc2
41+ # ## ======================================
3542define $(package)_set_vars
43+
3644$(package ) _config_opts=--target=$(host ) --disable-lto-support
3745$(package ) _ldflags+=-Wl,-rpath=\\$$$$$$$$\$$$$$$$$ORIGIN/../lib
3846
3947$(package ) _cc=$($(package ) _extract_dir) /toolchain/bin/clang
4048$(package ) _cxx=$($(package ) _extract_dir) /toolchain/bin/clang++
4149
50+ # === NEW: Inject native_libobjc2 paths ===
51+ $(package ) _cflags+=-I$($(package ) _staging_prefix_dir) /../native/include
52+ $(package ) _cxxflags+=-I$($(package ) _staging_prefix_dir) /../native/include
53+ $(package ) _ldflags+=-L$($(package ) _staging_prefix_dir) /../native/lib -lobjc
54+
4255ifeq ($(host_os ) ,darwin)
4356 $(package)_cc =gcc
4457 $(package)_cxx =g++
@@ -50,11 +63,18 @@ endif
5063
5164endef
5265
66+ # ## ======================================
67+ # ## PREPROCESS — CLEAN PATCHES ONLY
68+ # ## ======================================
5369define $(package)_preprocess_cmds
5470 cd $($(package ) _build_subdir) ; ./autogen.sh && \
5571 sed -i.old "/define HAVE_PTHREADS/d" ld64/src/ld/InputFiles.h && \
56- sed -i.old2 's/ libobjc2//g' Makefile.am && \
57- sed -i.old3 's/ libobjc2//g' Makefile.in
72+ \
73+ # === Remove internal libobjc2 references (we replace with native_libobjc2) ===
74+ sed -i.old2 's|\.\./libobjc2/libobjc.la||g' otool/Makefile.am && \
75+ sed -i.old3 's|\.\./libobjc2/libobjc.la||g' otool/Makefile.in && \
76+ sed -i.old4 's/ libobjc2//g' Makefile.am && \
77+ sed -i.old5 's/ libobjc2//g' Makefile.in
5878endef
5979
6080define $(package)_config_cmds
0 commit comments