зеркало из https://github.com/github/ruby.git
extmk.rb: replace current directory name
* ext/extmk.rb (extmake): replace "./" at beginning in LOCAL_LIBS with the current directory name for values cached in previous Makefile. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
429537310e
Коммит
5b6fc3f006
|
@ -293,7 +293,7 @@ def extmake(target)
|
|||
unless $mswin
|
||||
$extflags = split_libs($extflags, $DLDFLAGS, $LDFLAGS).uniq.join(" ")
|
||||
end
|
||||
$extlibs = merge_libs($extlibs, split_libs($libs), split_libs($LOCAL_LIBS))
|
||||
$extlibs = merge_libs($extlibs, split_libs($libs, $LOCAL_LIBS).map {|lib| lib.sub(/\A\.\//, "ext/#{target}/")})
|
||||
$extpath |= $LIBPATH
|
||||
end
|
||||
ensure
|
||||
|
|
|
@ -123,8 +123,7 @@ types.each do |type, signed|
|
|||
end
|
||||
|
||||
if libffi
|
||||
$LIBPATH.unshift libffi.lib
|
||||
$LOCAL_LIBS.prepend("#{libffi.a} ").strip!
|
||||
$LOCAL_LIBS.prepend("./#{libffi.a} ").strip!
|
||||
end
|
||||
create_makefile 'fiddle' do |conf|
|
||||
if !libffi
|
||||
|
@ -155,7 +154,6 @@ end
|
|||
|
||||
if libffi
|
||||
$LIBPATH.pop
|
||||
$LOCAL_LIBS.prepend("ext/fiddle/")
|
||||
end
|
||||
|
||||
# :startdoc:
|
||||
|
|
Загрузка…
Ссылка в новой задаче