1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.ac: move program_transform_name

Browse Source 
Historically `$program_transform_name` has been put in front of
`AC_CANONICAL_TARGET`.  Previous commit changes it, which affects the
name of generated ruby binary when cross-compiling.  I _guess_ the
historical behaviour is a bug (name of ruby binary shall honour --target
configure option I think), but anyways here I preserve that questionable
way.
This commit is contained in:
卜部昌平 2020-08-20 10:19:13 +09:00
parent 2c96e04868
commit 7341b1a53d
Notes: git 2020-08-21 11:05:20 +09:00 
Merged: https://github.com/ruby/ruby/pull/3433
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
configure.ac
View File

@ -71,10 +71,23 @@ AC_SUBST(TEENY)
AC_SUBST(RUBY_API_VERSION, '$(MAJOR).$(MINOR)') AC_SUBST(RUBY_API_VERSION, '$(MAJOR).$(MINOR)')
AC_SUBST(RUBY_PROGRAM_VERSION, '$(MAJOR).$(MINOR).$(TEENY)') AC_SUBST(RUBY_PROGRAM_VERSION, '$(MAJOR).$(MINOR).$(TEENY)')
AS_IF([test "$program_prefix" = NONE], [
program_prefix=
])
AS_IF([test "$prefix" -ef .], [
AC_MSG_ERROR(--prefix cannot be the current working directory.)
])
RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
AC_SUBST(RUBY_BASE_NAME)
AC_SUBST(RUBYW_BASE_NAME)
AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}')
dnl checks for alternative programs dnl checks for alternative programs
AC_CANONICAL_BUILD AC_CANONICAL_BUILD
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AC_ARG_PROGRAM
RUBY_RM_RECURSIVE RUBY_RM_RECURSIVE
AC_ARG_WITH(gcc, AC_ARG_WITH(gcc,
AS_HELP_STRING([--without-gcc], [never use gcc]), AS_HELP_STRING([--without-gcc], [never use gcc]),
@ -177,18 +190,6 @@ AC_CHECK_TOOLS([OBJCOPY], [gobjcopy objcopy])
AC_CHECK_TOOLS([OBJDUMP], [gobjdump objdump]) AC_CHECK_TOOLS([OBJDUMP], [gobjdump objdump])
AC_CHECK_TOOLS([STRIP], [gstrip strip], [:]) AC_CHECK_TOOLS([STRIP], [gstrip strip], [:])
AS_IF([test "$program_prefix" = NONE], [
program_prefix=
])
AS_IF([test "$prefix" -ef .], [
AC_MSG_ERROR(--prefix cannot be the current working directory.)
])
RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
AC_SUBST(RUBY_BASE_NAME)
AC_SUBST(RUBYW_BASE_NAME)
AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}')
test x"$target_alias" = x && test x"$target_alias" = x &&
target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'` target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
ac_install_sh='' # unusable for extension libraries. ac_install_sh='' # unusable for extension libraries.
@ -236,8 +237,6 @@ AC_ARG_ENABLE(load-relative,
AS_HELP_STRING([--enable-load-relative], [resolve load paths at run time]), AS_HELP_STRING([--enable-load-relative], [resolve load paths at run time]),
[load_relative=$enableval]) [load_relative=$enableval])
AC_ARG_PROGRAM
dnl Checks for programs. dnl Checks for programs.
cflagspat= cflagspat=