kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* common.mk (static-ruby): overridable.

Browse source 
* ext/extmk.rb (parse_args): force to link extensions statically only
  if static is given for extstatic.

* ext/extmk.rb (RUBY, RUBYW): overridable.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-11-16 14:25:53 +00:00
parent b30b46d139
commit 5a483d1943
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Wed Nov 16 23:24:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (static-ruby): overridable.
* ext/extmk.rb (parse_args): force to link extensions statically only
if static is given for extstatic.
* ext/extmk.rb (RUBY, RUBYW): overridable.
Tue Nov 15 23:46:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/find.rb (Find::find): should not ignore symbolic links to

6
common.mk
View file

@ -4,6 +4,8 @@ dll: $(LIBRUBY_SO);
RUBYOPT =
STATIC_RUBY = static-ruby
EXTCONF = extconf.rb
RBCONFIG = ./.rbconfig.time
@ -68,9 +70,9 @@ $(LIBRUBY_A): $(OBJS) $(DMYEXT)
$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(ARCHFILE)
static-ruby: $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A)
$(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
@$(RM) $@
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
ruby.imp: $(LIBRUBY_A)
@$(NM) -Pgp $(LIBRUBY_A) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@

10
ext/extmk.rb
View file

@ -217,8 +217,7 @@ def parse_args()
if ($extstatic = v) == false
$extstatic = []
elsif v
$force_static = true
$extstatic.delete("static")
$force_static = true if $extstatic.delete("static")
$extstatic = nil if $extstatic.empty?
end
end
@ -232,6 +231,7 @@ def parse_args()
$make = v || 'make'
end
opts.on('--make-flags=FLAGS', '--mflags', Shellwords) do |v|
v.grep(/\A([-\w]+)=(.*)/) {$configure_args["--#{$1}"] = $2}
if arg = v.first
arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
end
@ -326,7 +326,7 @@ end
for dir in ["ext", File::join($top_srcdir, "ext")]
setup = File::join(dir, CONFIG['setup'])
if File.file? setup
f = open(setup)
f = open(setup)
while line = f.gets()
line.chomp!
line.sub!(/#.*$/, '')
@ -458,9 +458,11 @@ SRC
$mflags.concat(conf)
end
rubies = []
%w[RUBY RUBYW].each {|r|
%w[RUBY RUBYW STATIC_RUBY].each {|r|
n = r
if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME")
rubies << r+EXEEXT
$mflags << "#{n}=#{r}"
end
}