null+****@clear*****
null+****@clear*****
2012年 3月 4日 (日) 19:02:46 JST
Kouhei Sutou 2012-03-04 19:02:46 +0900 (Sun, 04 Mar 2012)
New Revision: f5c8190107b1d4ca2b494c8b2a0aafd960ecbb62
Log:
Don't add -fno-script-aliasing for unavailable environment
Modified files:
configure.ac
lib/Makefile.am
Modified: configure.ac (+5 -0)
===================================================================
--- configure.ac 2012-03-04 18:54:24 +0900 (519b9bd)
+++ configure.ac 2012-03-04 19:02:46 +0900 (863bb28)
@@ -118,6 +118,7 @@ AC_DEFUN([REMOVE_CXXFLAG], [
])
TEST_CXXFLAGS=""
+NO_STRICT_ALIASING_CFLAGS=""
if test "$GCC" = "yes"; then
CHECK_BUILD_FLAG([-Wall])
CHECK_BUILD_FLAG([-Wextra])
@@ -132,6 +133,9 @@ if test "$GCC" = "yes"; then
CHECK_BUILD_FLAG([-Wformat=2])
CHECK_BUILD_FLAG([-Wstrict-aliasing=2])
+ if test "x$check_cflag" = "xyes"; then
+ NO_STRICT_ALIASING_CFLAGS="-fno-strict-aliasing"
+ fi
CHECK_BUILD_FLAG([-Wdisabled-optimization])
CHECK_BUILD_FLAG([-Wfloat-equal])
CHECK_BUILD_FLAG([-Wpointer-arith])
@@ -158,6 +162,7 @@ if test "$GCC" = "yes"; then
CXXFLAGS="$CXXFLAGS_for_source"
fi
AC_SUBST(TEST_CXXFLAGS)
+AC_SUBST(NO_STRICT_ALIASING_CFLAGS)
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
Modified: lib/Makefile.am (+1 -1)
===================================================================
--- lib/Makefile.am 2012-03-04 18:54:24 +0900 (7f8cfcd)
+++ lib/Makefile.am 2012-03-04 19:02:46 +0900 (175593e)
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libgroonga.la
include $(top_srcdir)/version.sh
AM_CFLAGS = \
- -fno-strict-aliasing \
+ $(NO_STRICT_ALIASING_CFLAGS) \
$(COVERAGE_CFLAGS) \
$(GRN_CFLAGS) \
$(MESSAGE_PACK_CFLAGS)