From a66b2c6df162f222f0adbbc027818326671fd9a1 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 27 Aug 2012 01:22:53 +0000
Subject: [PATCH] * nacl/GNUmakefile.in (CC, LD, NM, AR, AS, RANLIB, OBJDUMP,
 OBJCOPY)   Rewrites these variables instead of PATH.   NaCl port uses a
 toolchain which is specified by NACL_SDK_ROOT   environment variable.
 Originally, NaCl build added the toolchain   under the NACL_SDK_ROOT to the
 PATH. But updating PATH doesn't work   on Mac.   (RBCONFIG): Replaces configs
 with the variable updates above.

* configure.in: Thus it is no longer necessary to check $PATH.

Based on a patch by Takashi Toyoshima <toyoshim AT gmail.com>.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           | 14 ++++++++++++++
 configure.in        |  6 +-----
 nacl/GNUmakefile.in | 31 ++++++++++++++++++++++++++++---
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 91f58e3c20de31..928ede2d42ab97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Sun Aug 26 09:22:33 2012  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* nacl/GNUmakefile.in (CC, LD, NM, AR, AS, RANLIB, OBJDUMP, OBJCOPY)
+	  Rewrites these variables instead of PATH.
+	  NaCl port uses a toolchain which is specified by NACL_SDK_ROOT
+	  environment variable. Originally, NaCl build added the toolchain
+	  under the NACL_SDK_ROOT to the PATH. But updating PATH doesn't work
+	  on Mac.
+	  (RBCONFIG): Replaces configs with the variable updates above.
+
+	* configure.in: Thus it is no longer necessary to check $PATH.
+
+	Based on a patch by Takashi Toyoshima <toyoshim AT gmail.com>.
+
 Sun Aug 26 16:53:00 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* insns.def (checkmatch): suppress warnings.  [ruby-core:47310]
diff --git a/configure.in b/configure.in
index b490c4521977e6..ec144d2a4c20db 100644
--- a/configure.in
+++ b/configure.in
@@ -111,11 +111,7 @@ AC_DEFUN([RUBY_NACL],
   AC_MSG_RESULT(${NACL_TOOLCHAIN})
 
   AC_MSG_CHECKING([path to SDK])
-  if echo -- "${PATH}" | grep -F "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" > /dev/null; then
-    AC_MSG_RESULT([set])
-  else
-    AC_MSG_RESULT([no])
-    AC_MSG_WARN([Add "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" to \$PATH])
+  if ! echo -- "${PATH}" | grep -F "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" > /dev/null; then
     PATH="${PATH}:${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin"
   fi
 
diff --git a/nacl/GNUmakefile.in b/nacl/GNUmakefile.in
index ebb3bfb4011a87..6c9b0921f9fc77 100644
--- a/nacl/GNUmakefile.in
+++ b/nacl/GNUmakefile.in
@@ -7,7 +7,14 @@ include Makefile
 NACL_SDK_ROOT=@NACL_SDK_ROOT@
 NACL_TOOLCHAIN=@NACL_TOOLCHAIN@
 NACL_TOOLCHAIN_DIR=$(NACL_SDK_ROOT)/toolchain/$(NACL_TOOLCHAIN)
-PATH+=:$(NACL_TOOLCHAIN_DIR)/bin
+CC:=$(NACL_TOOLCHAIN_DIR)/bin/$(CC)
+LD:=$(NACL_TOOLCHAIN_DIR)/bin/$(LD)
+NM:=$(NACL_TOOLCHAIN_DIR)/bin/$(NM)
+AR:=$(NACL_TOOLCHAIN_DIR)/bin/$(AR)
+AS:=$(NACL_TOOLCHAIN_DIR)/bin/$(AS)
+RANLIB:=$(NACL_TOOLCHAIN_DIR)/bin/$(RANLIB)
+OBJDUMP:=$(NACL_TOOLCHAIN_DIR)/bin/$(OBJDUMP)
+OBJCOPY:=$(NACL_TOOLCHAIN_DIR)/bin/$(OBJCOPY)
 PYTHON=@PYTHON@
 
 PPROGRAM=pepper-$(PROGRAM)
@@ -40,6 +47,19 @@ file.$(OBJEXT):
 	$(Q) $(OBJCOPY) --weaken-symbol=rb_file_load_ok $@.tmp $@
 	@-$(RM) $@.tmp
 
+$(RBCONFIG):
+	@sed \
+	  -e 's!CONFIG\["CC"\] = .*!CONFIG\["CC"\] = "$(CC)"!' \
+	  -e 's!CONFIG\["LD"\] = .*!CONFIG\["LD"\] = "$(LD)"!' \
+	  -e 's!CONFIG\["NM"\] = .*!CONFIG\["NM"\] = "$(NM)"!' \
+	  -e 's!CONFIG\["AR"\] = .*!CONFIG\["AR"\] = "$(AR)"!' \
+	  -e 's!CONFIG\["AS"\] = .*!CONFIG\["AS"\] = "$(AS)"!' \
+	  -e 's!CONFIG\["RANLIB"\] = .*!CONFIG\["RANLIB"\] = "$(RANLIB)"!' \
+	  -e 's!CONFIG\["OBJDUMP"\] = .*!CONFIG\["OBJDUMP"\] = "$(OBJDUMP)"!' \
+	  -e 's!CONFIG\["OBJCOPY"\] = .*!CONFIG\["OBJCOPY"\] = "$(OBJCOPY)"!' \
+	-i.bak rbconfig.rb
+	@touch .rbconfig.time
+
 all: pprogram
 main: $(PROGRAM_NMF)
 pprogram: showflags $(PPROGRAM) $(PPROGRAM_NMF)
@@ -53,8 +73,13 @@ package: pprogram install-lib install-ext-comm install-ext-arch
 showflags: show_naclflags
 
 show_naclflags:
-	@echo "      PATH = $(PATH)"
-	@echo "      NACL_SDK_ROOT = $(NACL_SDK_ROOT)"
+	@echo "        NACL_SDK_ROOT = $(NACL_SDK_ROOT)"
+	@echo "        NM = $(NM)"
+	@echo "        AR = $(AR)"
+	@echo "        AS = $(AS)"
+	@echo "        RANLIB = $(RANLIB)"
+	@echo "        OBJDUMP = $(OBJDUMP)"
+	@echo "        OBJCOPY = $(OBJCOPY)"
 
 clean-local::
 	-$(RM) $(PPROGRAM) pepper_main.$(OBJEXT) $(PROGRAM_NMF) $(PPRGORAM_NMF)