archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove leading spaces from LIBPATHFLAG and RPATHFLAG

Browse source 
Join with a space in `MakeMakefile#libpathflag` instead.
This commit is contained in:
Nobuyoshi Nakada 2024-09-29 23:07:16 +09:00
parent 9138b388ee
commit 1f6d2e77d9
No known key found for this signature in database
GPG key ID: 3582D74E1FEE4465
Notes: git 2024-09-29 14:40:10 +00:00
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/mkmf.rb
View file

@ -583,14 +583,15 @@ MSG
end
def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
libpathflags = nil
libpath.map{|x|
case x
when "$(topdir)", /\A\./
LIBPATHFLAG
else
LIBPATHFLAG+RPATHFLAG
libpathflags ||= [LIBPATHFLAG, RPATHFLAG].grep(/\S/).join(" ")
end % x.quote
}.join
}.join(" ")
end
def werror_flag(opt = nil)

2
template/Makefile.in
View file

@ -360,7 +360,7 @@ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/confi
$(Q) sed '/^\$$:\.unshift/q' $(arch)-fake.rb > fake.rb
$(Q) $(BASERUBY) -p \
-e '~/^\s*CONFIG\["LDFLAGS"\]/ and' \
-e '$$_[/(?=\s*"$$)/] = %q[ #{(CONFIG["LIBPATHFLAG"]%File.dirname(__FILE__)).strip}]' \
-e '$$_[/(?=\s*"$$)/] = %q[ #{CONFIG["LIBPATHFLAG"]%File.dirname(__FILE__)}]' \
rbconfig.rb > fake-rbconfig.rb
$(INSTALL_SCRIPT) fake.rb $(XRUBY_RUBYLIBDIR)/$(arch)/fake.rb
$(INSTALL_SCRIPT) fake-rbconfig.rb $(XRUBY_RUBYLIBDIR)/$(arch)/rbconfig.rb