From d0d68df7d00f58c8ebb9a74f577dca389876d882 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 6 Sep 2012 16:21:57 +0000 Subject: mkmf.rb: fix splitting options with an argument * ext/extmk.rb (extmake), lib/mkmf.rb (have_framework): fix splitting options with an argument, not using NUL as special character. [ruby-core:47447] [Bug #6987] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/extmk.rb | 4 ++-- ext/tk/extconf.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ext') diff --git a/ext/extmk.rb b/ext/extmk.rb index e3685d0c7d..3082a00994 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -258,9 +258,9 @@ def extmake(target) $extlibs ||= [] $extpath ||= [] unless $mswin - $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ") + $extflags = split_libs($extflags, $DLDFLAGS, $LDFLAGS).uniq.join(" ") end - $extlibs = merge_libs($extlibs, $libs.split(/\s+(?=-|\z)/), $LOCAL_LIBS.split(/\s+(?=-|\z)/)) + $extlibs = merge_libs($extlibs, split_libs($libs), split_libs($LOCAL_LIBS)) $extpath |= $LIBPATH end ensure diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index 778201c396..72dd6cf21d 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -1995,7 +1995,7 @@ if TkLib_Config["tcltk-framework"] end end end - $LDFLAGS << ' ' << libs.gsub(/((?:\A|\s)-framework)\s/, "\\1\0") + $LDFLAGS << ' ' << libs $libs << ' -ltk -ltcl' setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir end -- cgit v1.2.3