From 7c2dad9c1f57f94851c9b212d5e1cd53ef07ba88 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 4 Aug 2005 15:20:10 +0000 Subject: [PATCH] * extmk.rb (extmake): needs to be wrapped in an Array. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- ext/extmk.rb | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91d706a819..e65daf9587 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Fri Aug 5 00:18:19 2005 Nobuyoshi Nakada +Fri Aug 5 00:19:33 2005 Nobuyoshi Nakada * enumerator.c (Init_Enumerator): provided features should have extensions. @@ -14,6 +14,8 @@ Fri Aug 5 00:18:19 2005 Nobuyoshi Nakada * parse.y (f_rest_arg): use anonymous variable for rest arguments. fixed: [ruby-dev:26647] + * extmk.rb (extmake): needs to be wrapped in an Array. + Thu Aug 4 20:03:18 2005 Tadashi Saito * numeric.c (Init_Numeric): do not share implementation among diff --git a/ext/extmk.rb b/ext/extmk.rb index 73cd6a1d5f..fc1a2f37ce 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -158,7 +158,7 @@ def extmake(target) end args = sysquote($mflags) unless $destdir.to_s.empty? or $mflags.include?("DESTDIR") - args += sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix)) + args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))] end if $static args += ["static"] unless $clean @@ -429,7 +429,8 @@ SRC $extpath.delete("$(topdir)") $extflags = libpathflag($extpath) << " " << $extflags.strip conf = [ - ['SETUP', $setup], [$enable_shared && !$force_static ? 'DLDOBJS' : 'EXTOBJS', $extobjs], + ['SETUP', $setup], + [enable_config("shared", $enable_shared) ? 'DLDOBJS' : 'EXTOBJS', $extobjs], ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags] ].map {|n, v| "#{n}=#{v}" if v and !(v = v.strip).empty?