diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-20 15:58:03 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-20 15:58:03 +0000 |
| commit | 03570f8091bc5641bdb0020eccfa6bdf8556c8c3 (patch) | |
| tree | 5145637f2e086780de48ed75532caa370b300427 /ext | |
| parent | f244f525c5172d25dbfb5cb0ef3af4428144d224 (diff) | |
| download | ruby-03570f8091bc5641bdb0020eccfa6bdf8556c8c3.tar.gz | |
ext/extmk.rb: workaround for -framework option
* ext/extmk.rb (extmake): assume non-option words are arguments.
workaround for -framework option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rwxr-xr-x | ext/extmk.rb | 2 | ||||
| -rw-r--r-- | ext/tk/extconf.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 9293ecaf87..069465e77f 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -260,7 +260,7 @@ def extmake(target) unless $mswin $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ") end - $extlibs = merge_libs($extlibs, $libs.split, $LOCAL_LIBS.split) + $extlibs = merge_libs($extlibs, $libs.split(/\s+(?=-|\z)/), $LOCAL_LIBS.split(/\s+(?=-|\z)/)) $extpath |= $LIBPATH end ensure diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index 155a92f6ab..6d34f1a492 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -1463,7 +1463,7 @@ end def setup_for_macosx_framework(tclver, tkver) # use framework, but no tclConfig.sh unless $LDFLAGS && $LDFLAGS.include?('-framework') - ($LDFLAGS ||= "") << ' -framework=Tk -framework=Tcl' + ($LDFLAGS ||= "") << ' -framework Tk -framework Tcl' end if TkLib_Config["tcl-framework-header"] |