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

mkmf.rb: untabify

Browse source 
* lib/mkmf.rb: untabify.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-09-21 00:35:09 +00:00
parent d9dfe2e514
commit ecc80b3cb4
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/mkmf.rb
View file

@ -1,4 +1,3 @@
# -*- indent-tabs-mode: t -*-
# module to create Makefile for extension modules # module to create Makefile for extension modules
# invoke like: ruby -r mkmf extconf.rb # invoke like: ruby -r mkmf extconf.rb
@ -639,13 +638,13 @@ int conftest_const = (int)(#{const});
int main() {printf("%d\\n", conftest_const); return 0;} int main() {printf("%d\\n", conftest_const); return 0;}
} }
begin begin
if try_link0(src, opt, &b) if try_link0(src, opt, &b)
xpopen("./conftest") do |f| xpopen("./conftest") do |f|
return Integer(f.gets) return Integer(f.gets)
end end
end end
ensure ensure
MakeMakefile.rm_f "conftest*" MakeMakefile.rm_f "conftest*"
end end
end end
nil nil
@ -1025,9 +1024,9 @@ SRC
opt = " -framework #{fw}" opt = " -framework #{fw}"
if try_link(src, "-ObjC#{opt}", &b) if try_link(src, "-ObjC#{opt}", &b)
$defs.push(format("-DHAVE_FRAMEWORK_%s", fw.tr_cpp)) $defs.push(format("-DHAVE_FRAMEWORK_%s", fw.tr_cpp))
# TODO: non-worse way than this hack, to get rid of separating # TODO: non-worse way than this hack, to get rid of separating
# option and its argument. # option and its argument.
$LDFLAGS << " -ObjC" unless /(\A|\s)-ObjC(\s|\z)/ =~ $LDFLAGS $LDFLAGS << " -ObjC" unless /(\A|\s)-ObjC(\s|\z)/ =~ $LDFLAGS
$LDFLAGS << opt $LDFLAGS << opt
true true
else else