Commit 8b55ceac authored by vasil's avatar vasil

branches/5.1:

Use CFLAGS instead of INNODB_CFLAGS to avoid having incompatible flags
inserted in CFLAGS and INNODB_CFLAGS and to avoid compiling mysql and
innodb with different flags.

Discussed with:	Sunny
parent e6ca57b1
...@@ -154,15 +154,15 @@ libinnobase_a_SOURCES = btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c \ ...@@ -154,15 +154,15 @@ libinnobase_a_SOURCES = btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c \
ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c \ ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c \
handler/ha_innodb.cc handler/ha_innodb.cc
libinnobase_a_CXXFLAGS= $(AM_CFLAGS) $(INNODB_CFLAGS) libinnobase_a_CXXFLAGS= $(AM_CFLAGS)
libinnobase_a_CFLAGS = $(AM_CFLAGS) $(INNODB_CFLAGS) libinnobase_a_CFLAGS = $(AM_CFLAGS)
EXTRA_LTLIBRARIES = ha_innodb.la EXTRA_LTLIBRARIES = ha_innodb.la
pkglib_LTLIBRARIES = @plugin_innobase_shared_target@ pkglib_LTLIBRARIES = @plugin_innobase_shared_target@
ha_innodb_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) ha_innodb_la_LDFLAGS = -module -rpath $(MYSQLLIBdir)
ha_innodb_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) ha_innodb_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
ha_innodb_la_CFLAGS = $(AM_CFLAGS) $(INNODB_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) ha_innodb_la_CFLAGS = $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
ha_innodb_la_SOURCES = $(libinnobase_a_SOURCES) ha_innodb_la_SOURCES = $(libinnobase_a_SOURCES)
EXTRA_DIST = CMakeLists.txt plug.in \ EXTRA_DIST = CMakeLists.txt plug.in \
......
...@@ -16,17 +16,17 @@ MYSQL_PLUGIN_ACTIONS(innobase, [ ...@@ -16,17 +16,17 @@ MYSQL_PLUGIN_ACTIONS(innobase, [
AC_C_BIGENDIAN AC_C_BIGENDIAN
case "$target_os" in case "$target_os" in
lin*) lin*)
INNODB_CFLAGS="-DUNIV_LINUX";; CFLAGS="-DUNIV_LINUX";;
hpux10*) hpux10*)
INNODB_CFLAGS="-DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10";; CFLAGS="-DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10";;
hp*) hp*)
INNODB_CFLAGS="-DUNIV_MUST_NOT_INLINE -DUNIV_HPUX";; CFLAGS="-DUNIV_MUST_NOT_INLINE -DUNIV_HPUX";;
aix*) aix*)
INNODB_CFLAGS="-DUNIV_AIX";; CFLAGS="-DUNIV_AIX";;
irix*|osf*|sysv5uw7*|openbsd*) irix*|osf*|sysv5uw7*|openbsd*)
INNODB_CFLAGS="-DUNIV_MUST_NOT_INLINE";; CFLAGS="-DUNIV_MUST_NOT_INLINE";;
*solaris*|*SunOS*) *solaris*|*SunOS*)
INNODB_CFLAGS="-DUNIV_SOLARIS";; CFLAGS="-DUNIV_SOLARIS";;
esac esac
INNODB_DYNAMIC_CFLAGS="-DMYSQL_DYNAMIC_PLUGIN" INNODB_DYNAMIC_CFLAGS="-DMYSQL_DYNAMIC_PLUGIN"
case "$target_cpu" in case "$target_cpu" in
...@@ -38,7 +38,6 @@ MYSQL_PLUGIN_ACTIONS(innobase, [ ...@@ -38,7 +38,6 @@ MYSQL_PLUGIN_ACTIONS(innobase, [
INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic" INNODB_DYNAMIC_CFLAGS="$INNODB_DYNAMIC_CFLAGS -prefer-non-pic"
;; ;;
esac esac
AC_SUBST(INNODB_CFLAGS)
AC_SUBST(INNODB_DYNAMIC_CFLAGS) AC_SUBST(INNODB_DYNAMIC_CFLAGS)
]) ])
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment