diff options
author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-12-23 22:12:22 +0000 |
---|---|---|
committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-12-23 22:12:22 +0000 |
commit | 45258ff4e23e3427b96bf3f36c393d1ac0c8f2e9 (patch) | |
tree | 9cdc3cd44f94c29b705708ab46cd6300751f9dfd /m4/acx_check_suncc.m4 | |
parent | bf06bb24bcbe413c15b4b09a944bb8510e252a9a (diff) | |
download | protobuf-45258ff4e23e3427b96bf3f36c393d1ac0c8f2e9.tar.gz protobuf-45258ff4e23e3427b96bf3f36c393d1ac0c8f2e9.tar.bz2 protobuf-45258ff4e23e3427b96bf3f36c393d1ac0c8f2e9.zip |
Fix 32/64-bit confusion on Solaris 10 x86. Patch from Oliver Jowett.
Diffstat (limited to 'm4/acx_check_suncc.m4')
-rw-r--r-- | m4/acx_check_suncc.m4 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/m4/acx_check_suncc.m4 b/m4/acx_check_suncc.m4 index 43887c9b..5bf72d3c 100644 --- a/m4/acx_check_suncc.m4 +++ b/m4/acx_check_suncc.m4 @@ -54,12 +54,19 @@ AC_DEFUN([ACX_CHECK_SUNCC],[ dnl This should just be set in CPPFLAGS and in LDFLAGS, but libtool dnl does the wrong thing if you don't put it into CXXFLAGS. sigh. + dnl (It also needs it in CFLAGS, or it does a different wrong thing!) AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],[ CXXFLAGS="${CXXFLAGS} -m64" ac_cv_env_CXXFLAGS_set=set ac_cv_env_CXXFLAGS_value='-m64' ]) + AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"],[ + CFLAGS="${CFLAGS} -m64" + ac_cv_env_CFLAGS_set=set + ac_cv_env_CFLAGS_value='-m64' + ]) + AS_IF([test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes" ],[ CXXFLAGS="-xmemalign=8s ${CXXFLAGS}" ]) |