kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

ext/extmk.rb: workaround for -framework option

Browse source 
* 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
This commit is contained in:
nobu 2012-05-20 15:58:03 +00:00
parent f244f525c5
commit 03570f8091
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/extmk.rb
View file

@ -260,7 +260,7 @@ def extmake(target)
unless $mswin unless $mswin
$extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ") $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ")
end 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 $extpath |= $LIBPATH
end end
ensure ensure

2
ext/tk/extconf.rb
View file

@ -1463,7 +1463,7 @@ end
def setup_for_macosx_framework(tclver, tkver) def setup_for_macosx_framework(tclver, tkver)
# use framework, but no tclConfig.sh # use framework, but no tclConfig.sh
unless $LDFLAGS && $LDFLAGS.include?('-framework') unless $LDFLAGS && $LDFLAGS.include?('-framework')
($LDFLAGS ||= "") << ' -framework=Tk -framework=Tcl' ($LDFLAGS ||= "") << ' -framework Tk -framework Tcl'
end end
if TkLib_Config["tcl-framework-header"] if TkLib_Config["tcl-framework-header"]

2
lib/mkmf.rb
View file

@ -1010,7 +1010,7 @@ SRC
def have_framework(fw, &b) def have_framework(fw, &b)
checking_for fw do checking_for fw do
src = cpp_include("#{fw}/#{fw}.h") << "\n" "int main(void){return 0;}" src = cpp_include("#{fw}/#{fw}.h") << "\n" "int main(void){return 0;}"
if try_link(src, opt = "-ObjC -framework=#{fw}", &b) if try_link(src, opt = "-ObjC -framework #{fw}", &b)
$defs.push(format("-DHAVE_FRAMEWORK_%s", fw.tr_cpp)) $defs.push(format("-DHAVE_FRAMEWORK_%s", fw.tr_cpp))
$LDFLAGS << " " << opt $LDFLAGS << " " << opt
true true