diff options
Diffstat (limited to 'ext')
| -rwxr-xr-x | ext/extmk.rb | 2 | ||||
| -rw-r--r-- | ext/fiddle/extconf.rb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index ca7a3dbd25..850461a359 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -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 diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb index f5c27cc934..1333bf549d 100644 --- a/ext/fiddle/extconf.rb +++ b/ext/fiddle/extconf.rb @@ -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: |