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

* lib/mkmf.rb (try_func): got rid of c-mode confusion.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-01-23 05:34:49 +00:00
parent 0af33599a0
commit 1c374fef37
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Jan 23 14:36:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (try_func): got rid of c-mode confusion.
Fri Jan 23 13:26:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* signal.c (trap_handler): also accepts symbols. [ruby-dev:37823]

9
lib/mkmf.rb
View file

@ -524,12 +524,13 @@ end
def try_func(func, libs, headers = nil, &b)
headers = cpp_include(headers)
try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
try_link(<<"SRC", libs, &b) or
#{headers}
/*top*/
#{MAIN_DOES_NOTHING}
int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
SRC
try_link(<<"SRC", libs, &b)
#{headers}
/*top*/
#{MAIN_DOES_NOTHING}
@ -1316,11 +1317,7 @@ def configuration(srcdir)
SHELL = /bin/sh
#### Start of system configuration section. ####
#{
if $extmk
"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/")
end
}
#{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk}
srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}.quote}
topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote}
hdrdir = #{CONFIG["hdrdir"].quote}