ruby-changes:22779
From: nobu <ko1@a...>
Date: Mon, 27 Feb 2012 10:54:33 +0900 (JST)
Subject: [ruby-changes:22779] nobu:r34828 (trunk): * lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): replace the
nobu 2012-02-27 10:54:23 +0900 (Mon, 27 Feb 2012) New Revision: 34828 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34828 Log: * lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): replace the target flags if the given flag is accepted. Modified files: trunk/ChangeLog trunk/lib/mkmf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 34827) +++ ChangeLog (revision 34828) @@ -1,3 +1,8 @@ +Mon Feb 27 10:54:20 2012 Nobuyoshi Nakada <nobu@r...> + + * lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): replace the + target flags if the given flag is accepted. + Mon Feb 27 10:53:44 2012 Nobuyoshi Nakada <nobu@r...> * test/rubygems/test_gem_specification.rb (test_self_from_yaml_syck_default_key_bug): Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 34827) +++ lib/mkmf.rb (revision 34828) @@ -550,6 +550,12 @@ $CPPFLAGS = cppflags unless ret end + def try_cppflags(flags) + with_cppflags(flags) do + try_header("int main() {return 0;}") + end + end + def with_cflags(flags) cflags = $CFLAGS $CFLAGS = flags @@ -558,6 +564,12 @@ $CFLAGS = cflags unless ret end + def try_cflags(flags) + with_cflags(flags) do + try_compile("int main() {return 0;}") + end + end + def with_ldflags(flags) ldflags = $LDFLAGS $LDFLAGS = flags @@ -566,6 +578,12 @@ $LDFLAGS = ldflags unless ret end + def try_ldflags(flags) + with_ldflags(flags) do + try_link("int main() {return 0;}") + end + end + def try_static_assert(expr, headers = nil, opt = "", &b) headers = cpp_include(headers) try_compile(<<SRC, opt, &b) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/