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

no alternate value expansion

* configure.in (opt-dir), tool/ifchange: get rid of "alternate value"
  expansion for legacy sh.  [ruby-dev:47420] [Bug #8524]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-06-13 12:30:24 +00:00
parent e6226e2c9d
commit f28ec8da8c
3 changed files with 11 additions and 3 deletions

View file

@ -1,3 +1,8 @@
Thu Jun 13 21:30:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (opt-dir), tool/ifchange: get rid of "alternate value"
expansion for legacy sh. [ruby-dev:47420] [Bug #8524]
Thu Jun 13 21:24:09 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (bigdivrem): Refactored to use ALLOCV_N for temporary

View file

@ -2625,8 +2625,10 @@ AC_ARG_WITH(opt-dir,
sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
done | tr '\012' ' '`
LDFLAGS_OPTDIR="$val"
LDFLAGS="$LDFLAGS${LDFLAGS:+ }$val"
DLDFLAGS="$DLDFLAGS${DLDFLAGS:+ }$val"
test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS "
LDFLAGS="$LDFLAGS$val"
test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS "
DLDFLAGS="$DLDFLAGS$val"
])
AS_CASE(["$target_cpu-$target_os"],

View file

@ -1,6 +1,7 @@
#!/bin/sh
# usage: ifchange target temporary
set -e
timestamp=
keepsuffix=
until [ "$0" = 0 ]; do
@ -37,7 +38,7 @@ if cmp "$target" "$temp" >/dev/null 2>&1; then
rm -f "$temp"
else
echo "$target updated"
${keepsuffix:+ mv -f "$target" "${target}${keepsuffix}" }
[ x"${keepsuffix}" = x ] || mv -f "$target" "${target}${keepsuffix}"
mv -f "$temp" "$target"
fi