mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
BUG#16282
Build gcc.o as a small library, instead of passing .cpp sources to the linker command (causes problems with parallel make on Solaris). This fix is for 4.1. In 5.0 and up a different fix is used. ndb/config/common.mk.am: Build gcc.o as a small library, instead of passing .cpp sources to the linker command (causes problems with parallel make on Solaris). ndb/config/type_ndbapitools.mk.am: Build gcc.o as a small library, instead of passing .cpp sources to the linker command (causes problems with parallel make on Solaris). ndb/src/common/portlib/Makefile.am: Build gcc.o as a small library, instead of passing .cpp sources to the linker command (causes problems with parallel make on Solaris). ndb/src/kernel/Makefile.am: Build gcc.o as a small library, instead of passing .cpp sources to the linker command (causes problems with parallel make on Solaris).
This commit is contained in:
parent
49591aa30b
commit
a5a48382d9
4 changed files with 6 additions and 4 deletions
|
@ -7,6 +7,6 @@ ndbapiincludedir = "$(pkgincludedir)/ndb/ndbapi"
|
|||
mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi"
|
||||
|
||||
INCLUDES = $(INCLUDES_LOC)
|
||||
LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC)
|
||||
LDADD = $(LDADD_LOC) -L$(top_srcdir)/ndb/src/common/portlib -lmygcc
|
||||
DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS)
|
||||
NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC)
|
||||
|
|
|
@ -3,7 +3,7 @@ LDADD += \
|
|||
$(top_builddir)/ndb/src/libndbclient.la \
|
||||
$(top_builddir)/dbug/libdbug.a \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
|
||||
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc
|
||||
|
||||
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/ndb/include \
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
noinst_HEADERS = gcc.cpp
|
||||
noinst_LIBRARIES = libmygcc.a
|
||||
libmygcc_a_SOURCES = gcc.cpp
|
||||
|
||||
noinst_LTLIBRARIES = libportlib.la
|
||||
|
||||
|
|
|
@ -53,7 +53,8 @@ LDADD += \
|
|||
$(top_builddir)/ndb/src/common/util/libgeneral.la \
|
||||
$(top_builddir)/dbug/libdbug.a \
|
||||
$(top_builddir)/mysys/libmysys.a \
|
||||
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
|
||||
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc
|
||||
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
|
Loading…
Reference in a new issue