зеркало из https://github.com/github/ruby.git
* lib/mkmf.rb (try_config): Fix to not replace $LDFLAGS with $libs
(1.9.3 behavior) [ruby-core:55752] [Bug #8595] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
3b25c2066a
Коммит
47434dc12f
|
@ -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
|
||||
|
|
|
@ -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",
|
||||
|
|
Загрузка…
Ссылка в новой задаче