correct line_ending

This commit is contained in:
2022-09-18 07:33:05 +08:00
parent 8f3b648c53
commit 1e6bb250b5
63 changed files with 10815 additions and 10804 deletions
+10 -4
View File
@@ -3,11 +3,11 @@ MonetDB_LIB =
MonetDB_INC =
Threading =
CXXFLAGS = --std=c++1z
OPTFLAGS = -g3 #-O3 -fno-semantic-interposition
OPTFLAGS = -O3 -fno-semantic-interposition
LINKFLAGS = -flto
SHAREDFLAGS = -shared
FPIC = -fPIC
COMPILER = $(shell $(CXX) --version | grep -q 'clang' && echo "clang"|| echo "gcc")
COMPILER = $(shell $(CXX) --version | grep -q clang && echo clang|| echo gcc)
LIBTOOL =
USELIB_FLAG = -Wl,--whole-archive,libaquery.a -Wl,-no-whole-archive
LIBAQ_SRC = server/server.cpp server/monetdb_conn.cpp server/io.cpp
@@ -18,12 +18,16 @@ else
PCHFLAGS =
endif
ifeq ($(OS),Windows_NT)
NULL_DEVICE = NUL
OS_SUPPORT += server/winhelper.cpp
MonetDB_LIB += msc-plugin/monetdbe.dll
MonetDB_INC += -Imonetdb/msvc
LIBTOOL = gcc-ar rcs
ifeq ($(COMPILER), clang )
FPIC =
endif
else
UNAME_S = $(shell uname -s)
UNAME_M = $(shell uname -m)
@@ -34,7 +38,7 @@ else
USELIB_FLAG = -Wl,-force_load
MonetDB_LIB += -L$(shell brew --prefix monetdb)/lib
MonetDB_INC += -I$(shell brew --prefix monetdb)/include/monetdb
ifeq ($(COMPILER), clang)
ifeq ($(COMPILER),clang )
LIBTOOL = libtool -static -o
endif
ifneq ($(UNAME_M),arm64)
@@ -61,7 +65,9 @@ info:
$(info "test")
$(info $(LIBTOOL))
$(info $(MonetDB_INC))
$(info $(COMPILER))
$(info $(CXX))
$(info $(FPIC))
pch:
$(CXX) -x c++-header server/pch.hpp $(FPIC) $(MonetDB_INC) $(OPTFLAGS) $(CXXFLAGS) $(Threading)
libaquery.a:
@@ -88,6 +94,6 @@ docker:
docker build -t aquery .
clean:
rm *.shm *.o dll.so server.so server.bin libaquery.a .cached -rf 2> $(NULL_DEVICE) || true
rm *.shm *.o dll.so server.so server.bin -rf 2> $(NULL_DEVICE) || true