bug fix on GNU ld
This commit is contained in:
@@ -12,15 +12,17 @@ else
|
|||||||
endif
|
endif
|
||||||
SHAREDFLAGS = -shared
|
SHAREDFLAGS = -shared
|
||||||
FPIC = -fPIC
|
FPIC = -fPIC
|
||||||
COMPILER = $(shell $(CXX) --version | grep -q clang && echo clang|| echo gcc)
|
_COMPILER = $(shell $(CXX) --version | grep -q clang && echo clang|| echo gcc)
|
||||||
|
COMPILER = $(strip $(_COMPILER))
|
||||||
LIBTOOL = ar rcs
|
LIBTOOL = ar rcs
|
||||||
USELIB_FLAG = -Wl,--whole-archive,libaquery.a -Wl,-no-whole-archive
|
USELIB_FLAG = -Wl,--whole-archive,libaquery.a -Wl,-no-whole-archive
|
||||||
LIBAQ_SRC = server/monetdb_conn.cpp server/libaquery.cpp
|
LIBAQ_SRC = server/monetdb_conn.cpp server/libaquery.cpp
|
||||||
LIBAQ_OBJ = monetdb_conn.o libaquery.o
|
LIBAQ_OBJ = monetdb_conn.o libaquery.o
|
||||||
SEMANTIC_INTERPOSITION = -fno-semantic-interposition
|
SEMANTIC_INTERPOSITION = -fno-semantic-interposition
|
||||||
RANLIB = ranlib
|
RANLIB = ranlib
|
||||||
LINKER_BINARY = $(shell $(CXX) -print-prog-name=ld | grep -q llvm && echo lld || echo ld)
|
_LINKER_BINARY = $(shell $(CXX) -print-prog-name=ld 2>&1 | grep -q LLVM && echo lld || echo ld)
|
||||||
ifeq (LINKER_BINARY, ld )
|
LINKER_BINARY = $(strip $(_LINKER_BINARY))q
|
||||||
|
ifeq ($(LINKER_BINARY), ld)
|
||||||
LINKER_FLAGS = -Wl,--allow-multiple-definition
|
LINKER_FLAGS = -Wl,--allow-multiple-definition
|
||||||
else
|
else
|
||||||
LINKER_FLAGS =
|
LINKER_FLAGS =
|
||||||
@@ -120,7 +122,8 @@ info:
|
|||||||
$(info $" MonetDB_INC: $(MonetDB_INC))
|
$(info $" MonetDB_INC: $(MonetDB_INC))
|
||||||
$(info $" COMPILER: $(COMPILER))
|
$(info $" COMPILER: $(COMPILER))
|
||||||
$(info $" CXX: $(CXX))
|
$(info $" CXX: $(CXX))
|
||||||
$(info $" FPIC: $(FPIC))
|
$(info $" LINKER_BINARY: $(LINKER_BINARY))
|
||||||
|
$(info $" LINKER_FLAGS: $(LINKER_FLAGS))
|
||||||
pch:
|
pch:
|
||||||
$(CXX) -x c++-header server/pch.hpp $(FPIC) $(CXXFLAGS)
|
$(CXX) -x c++-header server/pch.hpp $(FPIC) $(CXXFLAGS)
|
||||||
libaquery:
|
libaquery:
|
||||||
|
|||||||
Reference in New Issue
Block a user