aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-18 15:55:39 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-18 15:55:39 +0000
commit01cc8a86d210ad551bdf97b274f34c2a73c1ad94 (patch)
treeb833a6df99ca0d1f5fc69fc4e887f9c842482f42
parentb7bb9b6a42d790bb9f4a8ec9786bc23322035999 (diff)
downloadruby-01cc8a86d210ad551bdf97b274f34c2a73c1ad94.tar.gz
* ext/extmk.rb (--extflags): new option to pass EXTLDFLAGS to children,
expecially exts.mk. * common.mk (EXTMK_ARGS): use above option. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--common.mk3
-rwxr-xr-xext/extmk.rb3
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ce0bda252..ed17d6c7d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 19 00:53:26 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/extmk.rb (--extflags): new option to pass EXTLDFLAGS to children,
+ expecially exts.mk.
+
+ * common.mk (EXTMK_ARGS): use above option.
+
Wed Nov 18 22:50:43 2015 Koichi Sasada <ko1@atdot.net>
* vm_method.c (rb_class_clear_method_cache): should clear all
diff --git a/common.mk b/common.mk
index 602c3f7f0f..bc56c40a2f 100644
--- a/common.mk
+++ b/common.mk
@@ -137,7 +137,8 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \
--mflags="$(MFLAGS)" \
--make-flags="$(MAKEFLAGS)"
EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
- --make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" --gnumake=$(gnumake) \
+ --make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" \
+ --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
--
INSTRUBY = $(SUDO) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/tool/rbinstall.rb
INSTRUBY_ARGS = $(SCRIPT_ARGS) \
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 38b25e2a27..0f76bfcdc4 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -369,6 +369,9 @@ def parse_args()
opts.on('--gnumake=yes|no', true) do |v|
$gnumake = v
end
+ opts.on('--extflags=FLAGS') do |v|
+ $extflags = v || ""
+ end
end
begin
$optparser.parse!(ARGV)