diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-06-16 13:18:35 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-06-16 13:18:35 +0000 |
| commit | 150ca231eb01218677113575ae1fd8d551813ef3 (patch) | |
| tree | a17e453fb31d76a85e3a5bf62e101c35074409bb /ndb | |
| parent | cf5d0db657634c9949b4f9968c3bd4a050fe9066 (diff) | |
| parent | f7b17506594d8cce2e0a7ffa2baf323bafc3e879 (diff) | |
| download | mariadb-git-150ca231eb01218677113575ae1fd8d551813ef3.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/config/common.mk.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ndb/config/common.mk.am b/ndb/config/common.mk.am index 593e00d8959..869e2fae91d 100644 --- a/ndb/config/common.mk.am +++ b/ndb/config/common.mk.am @@ -9,5 +9,4 @@ mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi" INCLUDES = $(INCLUDES_LOC) LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC) DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS) -# ndb cannot be compiled with -fno-implicit-templaces -NDB_CXXFLAGS=-fimplicit-templates +NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) |