Skip to content

Commit 107f33d

Browse files
committed
depends: Delay expansion of per-package vars
Prior to this commit, when int_vars was called for packages, it would immediately expand the "single-dollar variables", which may be defined in terms of variables which are not yet determined (e.g. variables defined in package/*.mk, which are included after int_vars is called). This is required for the next commit as after that commit, for darwin cross-builds: 0. int_vars is defined in terms of $(1)_cc 1. $(1)_cc is defined in terms of darwin_CC 2. ... which is defined in terms of clang_resource_dir 3. ... which is defined in terms of native_cctools_clang_version 4. which is undetermined at the time when int_vars is being expanded and evaluated
1 parent d7e2401 commit 107f33d

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

depends/funcs.mk

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
define int_vars
22
#Set defaults for vars which may be overridden per-package
3-
$(1)_cc=$($($(1)_type)_CC)
4-
$(1)_cxx=$($($(1)_type)_CXX)
5-
$(1)_objc=$($($(1)_type)_OBJC)
6-
$(1)_objcxx=$($($(1)_type)_OBJCXX)
7-
$(1)_ar=$($($(1)_type)_AR)
8-
$(1)_ranlib=$($($(1)_type)_RANLIB)
9-
$(1)_libtool=$($($(1)_type)_LIBTOOL)
10-
$(1)_nm=$($($(1)_type)_NM)
11-
$(1)_cflags=$($($(1)_type)_CFLAGS) $($($(1)_type)_$(release_type)_CFLAGS)
12-
$(1)_cxxflags=$($($(1)_type)_CXXFLAGS) $($($(1)_type)_$(release_type)_CXXFLAGS)
13-
$(1)_ldflags=$($($(1)_type)_LDFLAGS) $($($(1)_type)_$(release_type)_LDFLAGS) -L$($($(1)_type)_prefix)/lib
14-
$(1)_cppflags=$($($(1)_type)_CPPFLAGS) $($($(1)_type)_$(release_type)_CPPFLAGS) -I$($($(1)_type)_prefix)/include
3+
$(1)_cc=$$($$($(1)_type)_CC)
4+
$(1)_cxx=$$($$($(1)_type)_CXX)
5+
$(1)_objc=$$($$($(1)_type)_OBJC)
6+
$(1)_objcxx=$$($$($(1)_type)_OBJCXX)
7+
$(1)_ar=$$($$($(1)_type)_AR)
8+
$(1)_ranlib=$$($$($(1)_type)_RANLIB)
9+
$(1)_libtool=$$($$($(1)_type)_LIBTOOL)
10+
$(1)_nm=$$($$($(1)_type)_NM)
11+
$(1)_cflags=$$($$($(1)_type)_CFLAGS) \
12+
$$($$($(1)_type)_$$(release_type)_CFLAGS)
13+
$(1)_cxxflags=$$($$($(1)_type)_CXXFLAGS) \
14+
$$($$($(1)_type)_$$(release_type)_CXXFLAGS)
15+
$(1)_ldflags=$$($$($(1)_type)_LDFLAGS) \
16+
$$($$($(1)_type)_$$(release_type)_LDFLAGS) \
17+
-L$$($($(1)_type)_prefix)/lib
18+
$(1)_cppflags=$$($$($(1)_type)_CPPFLAGS) \
19+
$$($$($(1)_type)_$$(release_type)_CPPFLAGS) \
20+
-I$$($$($(1)_type)_prefix)/include
1521
$(1)_recipe_hash:=
1622
endef
1723

0 commit comments

Comments
 (0)