[前][次][番号順一覧][スレッド一覧]

ruby-changes:65830

From: Nobuyoshi <ko1@a...>
Date: Sat, 10 Apr 2021 11:58:50 +0900 (JST)
Subject: [ruby-changes:65830] 68a6f6c4ab (master): mac: ignore SDKROOT at installation

https://git.ruby-lang.org/ruby.git/commit/?id=68a6f6c4ab

From 68a6f6c4abbd554c20ccd85a538dc4576aad87f0 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sat, 10 Apr 2021 11:57:45 +0900
Subject: mac: ignore SDKROOT at installation

---
 common.mk     | 2 +-
 defs/gmake.mk | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/common.mk b/common.mk
index 6183af9..17116c4 100644
--- a/common.mk
+++ b/common.mk
@@ -180,7 +180,7 @@ EXTMK_ARGS    =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \ https://github.com/ruby/ruby/blob/trunk/common.mk#L180
 		--make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" \
 		--gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
 		--
-INSTRUBY      =	$(SUDO) $(RUNRUBY) -r./$(arch)-fake $(tooldir)/rbinstall.rb
+INSTRUBY      =	$(SUDO) $(INSTRUBY_ENV) $(RUNRUBY) -r./$(arch)-fake $(tooldir)/rbinstall.rb
 INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
 		--data-mode=$(INSTALL_DATA_MODE) \
 		--prog-mode=$(INSTALL_PROG_MODE) \
diff --git a/defs/gmake.mk b/defs/gmake.mk
index f093fd4..316ff18 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -6,6 +6,10 @@ override mflags := $(filter-out -j%,$(MFLAGS)) https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L6
 MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j)
 nproc = $(subst -j,,$(filter -j%,$(MFLAGS)))
 
+ifneq ($(filter %darwin%,$(arch)),)
+INSTRUBY_ENV += SDKROOT=/
+endif
+
 CHECK_TARGETS := great exam love check test check% test% btest%
 # expand test targets, and those dependents
 TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS))
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]