Skip to content

Commit f0a0040

Browse files
committed
fix: ensure that dsymutil available even when FORCE_USE_SYSTEM_CLANG=1
`dsymutil` is defined as only available in `cctools` but Guix builds with `FORCE_USE_SYSTEM_CLANG`, which omits `cctools` (and therefore, `dsymutil`) but we use `dsymutil` to generate debug symbols, so we need to make sure that we get `dsymutil` one way or another.
1 parent 416e154 commit f0a0040

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

depends/hosts/darwin.mk

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,17 @@ OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-
88

99
darwin_native_binutils=native_cctools
1010

11+
cctools_TOOLS=AR RANLIB STRIP NM
12+
1113
ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
1214
# FORCE_USE_SYSTEM_CLANG is empty, so we use our depends-managed, pinned clang
1315
# from llvm.org
1416

1517
# Clang is a dependency of native_cctools when FORCE_USE_SYSTEM_CLANG is empty
1618
darwin_native_toolchain=native_cctools
1719

20+
cctools_TOOLS+=" DSYMUTIL"
21+
1822
clang_prog=$(build_prefix)/bin/clang
1923
clangxx_prog=$(clang_prog)++
2024
llvm_config_prog=$(build_prefix)/bin/llvm-config
@@ -40,11 +44,10 @@ llvm_config_prog=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-config")
4044

4145
llvm_lib_dir=$(shell $(llvm_config_prog) --libdir)
4246

47+
darwin_DSYMUTIL=$(shell $(SHELL) $(.SHELLFLAGS) "command -v dsymutil")
4348
darwin_OBJDUMP=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-objdump")
4449
endif
4550

46-
cctools_TOOLS=AR RANLIB STRIP NM DSYMUTIL
47-
4851
# Make-only lowercase function
4952
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))))))))))))))))))))))))))
5053

0 commit comments

Comments
 (0)