зеркало из https://github.com/github/ruby.git
* 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
This commit is contained in:
Родитель
710b99a16b
Коммит
7c2dad9c1f
|
@ -1,4 +1,4 @@
|
||||||
Fri Aug 5 00:18:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Fri Aug 5 00:19:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* enumerator.c (Init_Enumerator): provided features should have
|
* enumerator.c (Init_Enumerator): provided features should have
|
||||||
extensions.
|
extensions.
|
||||||
|
@ -14,6 +14,8 @@ Fri Aug 5 00:18:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
* parse.y (f_rest_arg): use anonymous variable for rest arguments.
|
* parse.y (f_rest_arg): use anonymous variable for rest arguments.
|
||||||
fixed: [ruby-dev:26647]
|
fixed: [ruby-dev:26647]
|
||||||
|
|
||||||
|
* extmk.rb (extmake): needs to be wrapped in an Array.
|
||||||
|
|
||||||
Thu Aug 4 20:03:18 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
|
Thu Aug 4 20:03:18 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
|
||||||
|
|
||||||
* numeric.c (Init_Numeric): do not share implementation among
|
* numeric.c (Init_Numeric): do not share implementation among
|
||||||
|
|
|
@ -158,7 +158,7 @@ def extmake(target)
|
||||||
end
|
end
|
||||||
args = sysquote($mflags)
|
args = sysquote($mflags)
|
||||||
unless $destdir.to_s.empty? or $mflags.include?("DESTDIR")
|
unless $destdir.to_s.empty? or $mflags.include?("DESTDIR")
|
||||||
args += sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))
|
args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
|
||||||
end
|
end
|
||||||
if $static
|
if $static
|
||||||
args += ["static"] unless $clean
|
args += ["static"] unless $clean
|
||||||
|
@ -429,7 +429,8 @@ SRC
|
||||||
$extpath.delete("$(topdir)")
|
$extpath.delete("$(topdir)")
|
||||||
$extflags = libpathflag($extpath) << " " << $extflags.strip
|
$extflags = libpathflag($extpath) << " " << $extflags.strip
|
||||||
conf = [
|
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]
|
['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
|
||||||
].map {|n, v|
|
].map {|n, v|
|
||||||
"#{n}=#{v}" if v and !(v = v.strip).empty?
|
"#{n}=#{v}" if v and !(v = v.strip).empty?
|
||||||
|
|
Загрузка…
Ссылка в новой задаче