From 038815a0153fcaa40834ddf0f36f54dd0f31c2d6 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 13 Nov 2002 07:30:24 +0000 Subject: * configure.in (DLDFLAGS): removed -Wl,-no-undefined to ext/extmk.rb, in order to allow references to symbols in other extension libraries for mkmf.rb. [ruby-dev:18724] * ext/extmk.rb (extmake): ditto. * ext/extmk.rb (extmake): exit when make failed. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/extmk.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'ext') diff --git a/ext/extmk.rb b/ext/extmk.rb index 0ed0559e9..60ee34b22 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -41,6 +41,10 @@ def extmake(target) init_mkmf + if /linux/ =~ RUBY_PLATFORM and $configure_args['--enable-shared'] and CONFIG["GNU_LD"] == "yes" + $DLDFLAGS << " -Wl,-no-undefined" + end + begin dir = Dir.pwd File.mkpath target unless File.directory?(target) @@ -70,7 +74,7 @@ def extmake(target) $extlist.push [$static, $target, File.basename($target)] end unless system($make, *$mflags) - $ignore or $continue or exit(1) + $ignore or $continue or return false end else open("./Makefile", "w") {|f| @@ -91,6 +95,7 @@ def extmake(target) rm_f "conftest*" Dir.chdir dir end + true end require 'getopts' @@ -175,7 +180,7 @@ ext_prefix = "#{$top_srcdir}/ext" Dir.glob("#{ext_prefix}/**/MANIFEST") do |d| d = File.dirname(d) d.slice!(0, ext_prefix.length + 1) - extmake(d) + extmake(d) or exit(1) end if $ignore -- cgit