diff options
| author | Nobuyoshi Nakada <[email protected]> | 2024-09-29 23:07:16 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2024-09-29 23:07:16 +0900 |
| commit | 1f6d2e77d9be9a5a829e60908d21d621f4e1ceb0 () | |
| tree | 09590f4981bcb0336a89cfa1060988d53f073ae9 | |
| parent | 9138b388eea48e6f1c005a9a3071aed72799f0cc (diff) | |
Remove leading spaces from `LIBPATHFLAG` and `RPATHFLAG`
Join with a space in `MakeMakefile#libpathflag` instead.
Notes: Merged: https://.com/ruby/ruby/pull/11724
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 7 | ||||
| -rw-r--r-- | template/Makefile.in | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
4 files changed, 8 insertions, 7 deletions
@@ -662,9 +662,9 @@ RUBY_WERROR_FLAG([ [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"]) AS_IF([test "$enable_rpath:${RPATHFLAG}" = yes:], [ - RPATHFLAG="${rpathflag:+ ${rpathflag}%1\$-s}" ]) - AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}]) } RUBY_TRY_LDFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no]) @@ -583,14 +583,15 @@ MSG end def libpathflag(libpath=$DEFLIBPATH|$LIBPATH) libpath.map{|x| case x when "$(topdir)", /\A\./ LIBPATHFLAG else - LIBPATHFLAG+RPATHFLAG end % x.quote - }.join end def werror_flag(opt = nil) @@ -2906,7 +2907,7 @@ MESSAGE ## # Argument which will add a library path to the linker - LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L%s' ## # Argument which will add a runtime library path to the linker @@ -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}]' \ rbconfig.rb > fake-rbconfig.rb $(INSTALL_SCRIPT) fake.rb $(XRUBY_RUBYLIBDIR)/$(arch)/fake.rb $(INSTALL_SCRIPT) fake-rbconfig.rb $(XRUBY_RUBYLIBDIR)/$(arch)/rbconfig.rb @@ -1095,7 +1095,7 @@ s,@CSRCFLAG@,$(CSRCFLAG),;t t s,@CPPOUTFILE@,-P,;t t s,@PRELOADENV@,,;t t s,@LIBPATHENV@,PATH,;t t -s,@LIBPATHFLAG@, -libpath:%s,;t t s,@RPATHFLAG@,,;t t s,@LIBARG@,%s.lib,;t t s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) -link $$(DLDFLAGS) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb -def:$$(DEFFILE),;t t |