summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-12 02:02:57 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-12 02:02:57 +0000
commit9f94dfebad123e6df37ea1a84b3a55e03914a348 (patch)
tree7bb973e9263ecc93cd9c19b7e521b73822f84f35
parent678ae5d17f0345e2a9ed5a96f142ff432993acfc (diff)
configure.in: trailing spaces
* configure.in (CFLAGS, LDFLAGS): do not append trailing spaces. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--configure.in18
1 files changed, 10 insertions, 8 deletions
diff --git a/configure.in b/configure.in
index 0089957aabb..b49ae426567 100644
--- a/configure.in
+++ b/configure.in
@@ -432,8 +432,8 @@ else
rb_cv_target_archs=${target_archs}
fi
if test "x${ARCH_FLAG}" != x; then
- CFLAGS="$CFLAGS ${ARCH_FLAG}"
- LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}"
+ CFLAGS="${CFLAGS:+$CFLAGS }${ARCH_FLAG}"
+ LDFLAGS="${LDFLAGS:+$LDFLAGS }${ARCH_FLAG}"
fi
# RUBY_UNIVERSAL_ARCH end
])
@@ -1012,7 +1012,7 @@ AS_CASE(["$target_os"],
incs=`echo "$incs" | fgrep -v "$d"`
done
for d in $incs; do
- test -d "$d" && LDFLAGS="${LDFLAGS:+$LDFLAGS }-L$d"
+ test -d "$d" && RUBY_APPEND_OPTIONS(LDFLAGS, "-L$d")
done
ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage
ac_cv_lib_crypt_crypt=no
@@ -3076,11 +3076,13 @@ if test "x$OPT_DIR" != x; then
for dir in $OPT_DIR; do
echo x ${LIBPATHFLAG} ${RPATHFLAG} |
sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
- done | tr '\012' ' '`
- test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS "
- LDFLAGS="$LDFLAGS$val"
- test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS "
- DLDFLAGS="$DLDFLAGS$val"
+ done | tr '\012' ' ' | sed 's/ *$//'`
+ if test x"$val" != x; then
+ test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS "
+ LDFLAGS="$LDFLAGS$val"
+ test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS "
+ DLDFLAGS="$DLDFLAGS$val"
+ fi
LDFLAGS_OPTDIR="$val"
fi