Skip to content

Commit 91f6fec

Browse files
nobuXrXr
authored andcommitted
mac: ignore SDKROOT at installation
1 parent 9557641 commit 91f6fec

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

common.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
185185
--make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" \
186186
--gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
187187
--
188-
INSTRUBY = $(SUDO) $(RUNRUBY) -r./$(arch)-fake $(tooldir)/rbinstall.rb
188+
INSTRUBY = $(SUDO) $(INSTRUBY_ENV) $(RUNRUBY) -r./$(arch)-fake $(tooldir)/rbinstall.rb
189189
INSTRUBY_ARGS = $(SCRIPT_ARGS) \
190190
--data-mode=$(INSTALL_DATA_MODE) \
191191
--prog-mode=$(INSTALL_PROG_MODE) \

defs/gmake.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ override mflags := $(filter-out -j%,$(MFLAGS))
66
MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j)
77
nproc = $(subst -j,,$(filter -j%,$(MFLAGS)))
88

9+
ifneq ($(filter %darwin%,$(arch)),)
10+
INSTRUBY_ENV += SDKROOT=/
11+
endif
12+
913
CHECK_TARGETS := great exam love check test check% test% btest%
1014
# expand test targets, and those dependents
1115
TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS))

0 commit comments

Comments
 (0)