1.1 --- a/common/autoconf/platform.m4 Thu Aug 08 10:10:24 2013 -0700
1.2 +++ b/common/autoconf/platform.m4 Thu Aug 15 17:14:53 2013 +0200
1.3 @@ -412,17 +412,16 @@
1.4 [
1.5 # keep track of c/cxx flags that we added outselves...
1.6 # to prevent emitting warning...
1.7 - ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.8 - ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.9 - ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.10 + TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
1.11 + AC_SUBST(TARGET_BITS_FLAG)
1.12
1.13 - CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
1.14 - CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
1.15 - LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
1.16 + CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}"
1.17 + CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}"
1.18 + LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}"
1.19
1.20 - CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
1.21 - CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
1.22 - LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
1.23 + CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.24 + CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.25 + LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.26 ])
1.27
1.28 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_BITS],
