summaryrefslogtreecommitdiff
path: root/ndb/config
diff options
context:
space:
mode:
authorunknown <tomas@mc05.(none)>2004-05-12 12:14:54 +0200
committerunknown <tomas@mc05.(none)>2004-05-12 12:14:54 +0200
commit2e9dee04e082c7b61b57d4754c72a2ecfd67c75e (patch)
tree4c444e6c0d7731b5df0d85d97a1a55bb96c8eac0 /ndb/config
parent69424ca9abd94729693a593a1ceb899d756ffbf7 (diff)
downloadmariadb-git-2e9dee04e082c7b61b57d4754c72a2ecfd67c75e.tar.gz
portability/autoconf fixes
ndb/config/Defs.LINUX.x86.GCC.mk: postability/autoconf fixes ndb/include/portlib/NdbMutex.h: postability/autoconf fixes ndb/src/common/editline/unix.h: postability/autoconf fixes ndb/src/common/portlib/memtest/memtest.c: postability/autoconf fixes ndb/src/common/portlib/unix/NdbTCP.c: postability/autoconf fixes ndb/src/common/portlib/unix/NdbThread.c: postability/autoconf fixes ndb/src/common/transporter/Makefile: postability/autoconf fixes ndb/src/common/transporter/SHM_Transporter.cpp: postability/autoconf fixes ndb/src/mgmsrv/MgmtSrvr.cpp: postability/autoconf fixes
Diffstat (limited to 'ndb/config')
-rw-r--r--ndb/config/Defs.LINUX.x86.GCC.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/ndb/config/Defs.LINUX.x86.GCC.mk b/ndb/config/Defs.LINUX.x86.GCC.mk
index 698b0eb8350..6167a30ff23 100644
--- a/ndb/config/Defs.LINUX.x86.GCC.mk
+++ b/ndb/config/Defs.LINUX.x86.GCC.mk
@@ -6,9 +6,11 @@ SHELL := /bin/sh
C++ := gcc$(GCC_VERSION)
CC := gcc$(GCC_VERSION)
AR_RCS := $(PURE) ar rcs
-SO := gcc$(GCC_VERSION) -shared -lpthread -o
+SO := gcc$(GCC_VERSION) -shared -lpthread -o
+#SO := gcc$(GCC_VERSION) -shared -o
MAKEDEPEND := gcc$(GCC_VERSION) -M
+#MAKEDEPEND := gcc$(GCC_VERSION) -M -nostdinc -nostdinc++
PIC := -fPIC
RPCGENFLAGS := -M -C -N
@@ -27,7 +29,8 @@ else
CCFLAGS_WARNINGS = -Wno-long-long -Wall
endif
# Add these for more warnings -Weffc++ -W
-CCFLAGS_TOP = -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+CCFLAGS_TOP =
+#CCFLAGS_TOP = -DSAFE_MUTEX
CCFLAGS_TOP += -fno-rtti -fno-exceptions
ifeq (RELEASE, $(NDB_VERSION))
@@ -53,4 +56,5 @@ LINK.cc = $(PURE) $(CC) $(CCFLAGS) $(LDFLAGS)
LINK.c = $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)
-LDFLAGS_LAST = -lpthread -lrt $(NDB_TOP)/src/common/portlib/gcc.cpp
+LDFLAGS_LAST = -lrt -lpthread $(NDB_TOP)/src/common/portlib/gcc.cpp
+#LDFLAGS_LAST = -lrt $(NDB_TOP)/src/common/portlib/gcc.cpp $(NDB_TOP)/../mysys/libmysys.a $(NDB_TOP)/../dbug/libdbug.a $(NDB_TOP)/../regex/libregex.a $(NDB_TOP)/../strings/libmystrings.a -lpthread