diff options
| author |  Feng Xiao <xiaofeng@google.com> | 2016-01-20 16:57:01 -0800 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2016-01-20 16:57:01 -0800 |
| commit | fe066bd514fcd08f2c2bf94d3d0e89e3c4f10884 (patch) | |
| tree | d52806441cbeddd4bc62e62ea5583147143298f5 /m4 | |
| parent | 8c5260b21bb0e217e91375893d507a0ef6578d67 (diff) | |
| parent | 97fa4ca1565d216d102af9510b17966c28c7a52a (diff) | |
Merge pull request #789 from motahan/solaris64_fix
Fixing compile errors on Solaris in 64-bit mode
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/acx_check_suncc.m4 | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/m4/acx_check_suncc.m4 b/m4/acx_check_suncc.m4 index 89185932..8bc0a890 100644 --- a/m4/acx_check_suncc.m4 +++ b/m4/acx_check_suncc.m4 @@ -42,7 +42,6 @@ AC_DEFUN([ACX_CHECK_SUNCC],[ AS_IF([test "x$ac_enable_64bit" = "xyes"],[ - AC_DEFINE([SOLARIS_64BIT_ENABLED], [1], [64bit enabled]) AS_IF([test "x$libdir" = "x\${exec_prefix}/lib"],[ dnl The user hasn't overridden the default libdir, so we'll dnl the dir suffix to match solaris 32/64-bit policy @@ -52,17 +51,13 @@ 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' - ]) + 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' - ]) + 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}" |