[前][次][番号順一覧][スレッド一覧]

ruby-changes:37491

From: nobu <ko1@a...>
Date: Thu, 12 Feb 2015 11:03:06 +0900 (JST)
Subject: [ruby-changes:37491] nobu:r49572 (trunk): configure.in: trailing spaces

nobu	2015-02-12 11:02:57 +0900 (Thu, 12 Feb 2015)

  New Revision: 49572

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49572

  Log:
    configure.in: trailing spaces
    
    * configure.in (CFLAGS, LDFLAGS): do not append trailing spaces.

  Modified files:
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 49571)
+++ configure.in	(revision 49572)
@@ -432,8 +432,8 @@ else https://github.com/ruby/ruby/blob/trunk/configure.in#L432
     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"], https://github.com/ruby/ruby/blob/trunk/configure.in#L1012
 		    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 https://github.com/ruby/ruby/blob/trunk/configure.in#L3076
         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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]