bill/AQuery
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix on GNU ld

Browse Source
This commit is contained in:
bill
2022-11-14 02:36:06 +08:00
parent a5f22475b4
commit 5045056403
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+10 -7
View File
@@ -12,21 +12,23 @@ 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 =
endif endif
ifeq ($(COMPILER), clang ) ifeq ($(COMPILER), clang)
CLANG_GE_10 = $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 10) CLANG_GE_10 = $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 10)
ifneq ($(CLANG_GE_10), 1) ifneq ($(CLANG_GE_10), 1)
SEMANTIC_INTERPOSITION = SEMANTIC_INTERPOSITION =
@@ -56,7 +58,7 @@ ifeq ($(OS),Windows_NT)
MonetDB_LIB += msc-plugin/monetdbe.dll MonetDB_LIB += msc-plugin/monetdbe.dll
MonetDB_INC += -Imonetdb/msvc MonetDB_INC += -Imonetdb/msvc
LIBTOOL = gcc-ar rcs LIBTOOL = gcc-ar rcs
ifeq ($(COMPILER), clang ) ifeq ($(COMPILER), clang)
FPIC = FPIC =
endif endif
else else
@@ -68,7 +70,7 @@ else
USELIB_FLAG = -Wl,-force_load USELIB_FLAG = -Wl,-force_load
MonetDB_LIB += -L$(shell brew --prefix monetdb)/lib MonetDB_LIB += -L$(shell brew --prefix monetdb)/lib
MonetDB_INC += -I$(shell brew --prefix monetdb)/include/monetdb MonetDB_INC += -I$(shell brew --prefix monetdb)/include/monetdb
ifeq ($(COMPILER), clang ) ifeq ($(COMPILER), clang)
LIBTOOL = libtool -static -o LIBTOOL = libtool -static -o
endif endif
ifneq ($(UNAME_M),arm64) ifneq ($(UNAME_M),arm64)
@@ -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: