diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Jul 2 11:14:36 2013 Shota Fukumori <sorah@cookpad.com> + + * lib/mkmf.rb (try_config): Fix to not replace $LDFLAGS with $libs + (1.9.3 behavior) [ruby-core:55752] [Bug #8595] + Tue Jul 2 00:39:59 2013 Tanaka Akira <akr@fsij.org> * ext/socket/ipsocket.c (init_inetsock_internal): Don't try mismached diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 146225d4d5..8179974034 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1747,6 +1747,7 @@ SRC # default to package specific config command, as a last resort. get = proc {|opt| `#{pkgconfig} --#{opt}`.strip} end + orig_ldflags = $LDFLAGS if get and option get[option] elsif get and try_ldflags(ldflags = get['libs']) @@ -1754,7 +1755,7 @@ SRC libs = get['libs-only-l'] ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ") $CFLAGS += " " << cflags - $LDFLAGS += " " << ldflags + $LDFLAGS = [orig_ldflags, ldflags].join(' ') $libs += " " << libs Logging::message "package configuration for %s\n", pkg Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", |