Skip to content

Commit f3af4f7

Browse files
committed
build: Let the depends build system define a path to dsymutil tool
1 parent b0a8dda commit f3af4f7

File tree

6 files changed

+11
-3
lines changed

6 files changed

+11
-3
lines changed

Diff for: depends/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
224224
-e 's|@STRIP@|$(host_STRIP)|' \
225225
-e 's|@OTOOL@|$(host_OTOOL)|' \
226226
-e 's|@INSTALL_NAME_TOOL@|$(host_INSTALL_NAME_TOOL)|' \
227+
-e 's|@DSYMUTIL@|$(host_DSYMUTIL)|' \
227228
-e 's|@build_os@|$(build_os)|' \
228229
-e 's|@host_os@|$(host_os)|' \
229230
-e 's|@CFLAGS@|$(strip $(host_CFLAGS) $(host_$(release_type)_CFLAGS))|' \

Diff for: depends/builders/darwin.mk

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ build_darwin_STRIP:=$(shell xcrun -f strip)
66
build_darwin_OTOOL:=$(shell xcrun -f otool)
77
build_darwin_NM:=$(shell xcrun -f nm)
88
build_darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool)
9+
build_darwin_DSYMUTIL:=$(shell xcrun -f dsymutil)
910
build_darwin_SHA256SUM=shasum -a 256
1011
build_darwin_DOWNLOAD=curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
1112

@@ -19,6 +20,7 @@ darwin_LIBTOOL:=$(shell xcrun -f libtool)
1920
darwin_OTOOL:=$(shell xcrun -f otool)
2021
darwin_NM:=$(shell xcrun -f nm)
2122
darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool)
23+
darwin_DSYMUTIL:=$(shell xcrun -f dsymutil)
2224
darwin_native_binutils=
2325
darwin_native_toolchain=
2426

Diff for: depends/builders/default.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ build_$(build_os)_$1 ?= $$(default_build_$1)
1111
build_$(build_arch)_$(build_os)_$1 ?= $$(build_$(build_os)_$1)
1212
build_$1=$$(build_$(build_arch)_$(build_os)_$1)
1313
endef
14-
$(foreach var,CC CXX AR TAR RANLIB NM STRIP SHA256SUM DOWNLOAD OTOOL INSTALL_NAME_TOOL,$(eval $(call add_build_tool_func,$(var))))
14+
$(foreach var,CC CXX AR TAR RANLIB NM STRIP SHA256SUM DOWNLOAD OTOOL INSTALL_NAME_TOOL DSYMUTIL,$(eval $(call add_build_tool_func,$(var))))
1515
define add_build_flags_func
1616
build_$(build_arch)_$(build_os)_$1 += $(build_$(build_os)_$1)
1717
build_$1=$$(build_$(build_arch)_$(build_os)_$1)

Diff for: depends/config.site.in

+5
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ if test "@host_os@" = darwin; then
130130
INSTALL_NAME_TOOL="@INSTALL_NAME_TOOL@"
131131
ac_cv_path_ac_pt_INSTALL_NAME_TOOL="${INSTALL_NAME_TOOL}"
132132
fi
133+
134+
if test -n "@DSYMUTIL@"; then
135+
DSYMUTIL="@DSYMUTIL@"
136+
ac_cv_path_ac_pt_DSYMUTIL="${DSYMUTIL}"
137+
fi
133138
fi
134139

135140
if test -n "@debug@"; then

Diff for: depends/hosts/darwin.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ clangxx_prog=$(shell $(SHELL) $(.SHELLFLAGS) "command -v clang++")
3838
clang_resource_dir=$(shell clang -print-resource-dir)
3939
endif
4040

41-
cctools_TOOLS=AR RANLIB STRIP NM LIBTOOL OTOOL INSTALL_NAME_TOOL
41+
cctools_TOOLS=AR RANLIB STRIP NM LIBTOOL OTOOL INSTALL_NAME_TOOL DSYMUTIL
4242

4343
# Make-only lowercase function
4444
lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1))))))))))))))))))))))))))

Diff for: depends/hosts/default.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ host_$1 = $$($(host_arch)_$(host_os)_$1)
3333
host_$(release_type)_$1 = $$($(host_arch)_$(host_os)_$(release_type)_$1)
3434
endef
3535

36-
$(foreach tool,CC CXX AR RANLIB STRIP NM LIBTOOL OTOOL INSTALL_NAME_TOOL,$(eval $(call add_host_tool_func,$(tool))))
36+
$(foreach tool,CC CXX AR RANLIB STRIP NM LIBTOOL OTOOL INSTALL_NAME_TOOL DSYMUTIL,$(eval $(call add_host_tool_func,$(tool))))
3737
$(foreach flags,CFLAGS CXXFLAGS CPPFLAGS LDFLAGS, $(eval $(call add_host_flags_func,$(flags))))

0 commit comments

Comments
 (0)