summaryrefslogtreecommitdiff
path: root/libmysqld/examples
diff options
context:
space:
mode:
authorlenz@mysql.com <>2003-09-12 12:42:34 +0200
committerlenz@mysql.com <>2003-09-12 12:42:34 +0200
commitedfbc3d3e826187fbbb1dbd2d3750995b25d088e (patch)
treeaa764437ec69be153252826ff2bde43aaa638f93 /libmysqld/examples
parent541189e746bd89d56657438bd7c9d14910857c2b (diff)
downloadmariadb-git-edfbc3d3e826187fbbb1dbd2d3750995b25d088e.tar.gz
Portability fixes:
- removed "-traditional-cpp" from the darwin6 compile flags, as it broke compilation with gcc-3.3 on Mac OS X and does not seem to be required in general. - make sure to link libmysqld/examples/mysqltest.c with a C++ compiler, as the embedded server library (libmysqld.a) includes C++ code. This broke compilation with non-gcc compilers.
Diffstat (limited to 'libmysqld/examples')
-rw-r--r--libmysqld/examples/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index f741ddf0191..61f54b88b2e 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -13,6 +13,8 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \
LIBS = @LIBS@ @WRAPLIBS@
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
+mysqltest_LINK = $(CXXLINK)
+
mysqltest_SOURCES = mysqltest.c
mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \