diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-23 05:34:49 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-23 05:34:49 +0000 |
| commit | 1c374fef37707468de12e95f51ce01334ae7832a (patch) | |
| tree | 351e3fa6dfc0328fe78ba3ab221cedba6cb932d7 | |
| parent | 0af33599a0d8d28e62dca5b2ed4f3cf916c590b5 (diff) | |
* lib/mkmf.rb (try_func): got rid of c-mode confusion.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 9 |
2 files changed, 7 insertions, 6 deletions
@@ -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] diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 401b569f7d..0f6f61d984 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -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} |