From adbf87232c8d772dd6cd657a99c76b4cc8cb02c0 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 18 Nov 2015 15:55:39 +0000 Subject: [PATCH] * 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 --- ChangeLog | 7 +++++++ common.mk | 3 ++- ext/extmk.rb | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) 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 + + * 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 * 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)