Merge pull request #25 from evansd/makefile-fixes

Makefile fixes
This commit is contained in:
Colin Dellow 2018-06-25 13:54:29 -04:00 committed by GitHub
commit 129ff4e694
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -31,7 +31,7 @@ ZSTD_LIB = $(ZSTD)/lib/libzstd.a
# Flags # Flags
CC = g++ CC = g++
CPUS:=$(shell nproc) CPUS:=$(shell nproc)
CFLAGS = -I $(SQLITE) -O3 -std=c++11 -Wall -fPIC -g CFLAGS = -I $(SQLITE) -I $(PARQUET_CPP)/src -I $(ARROW)/cpp/src -O3 -std=c++11 -Wall -fPIC -g
LDFLAGS = -O3 \ LDFLAGS = -O3 \
-Wl,--whole-archive $(PARQUET_CPP_LIB) $(LZ4_LIB) $(ZSTD_LIB) $(THRIFT_LIB) $(SNAPPY_LIB) $(ARROW_LIB) \ -Wl,--whole-archive $(PARQUET_CPP_LIB) $(LZ4_LIB) $(ZSTD_LIB) $(THRIFT_LIB) $(SNAPPY_LIB) $(ARROW_LIB) \
@ -48,7 +48,7 @@ LIBS = $(ARROW_LIB) \
$(ZLIB_LIB) \ $(ZLIB_LIB) \
$(ZSTD_LIB) $(ZSTD_LIB)
libparquet.so: $(OBJ) $(LIBS) libparquet.so: $(LIBS) $(OBJ)
$(CC) -shared -o $@ $(OBJ) $(LDFLAGS) $(CC) -shared -o $@ $(OBJ) $(LDFLAGS)
parquet_filter.o: $(VTABLE)/parquet_filter.cc $(VTABLE)/parquet_filter.h parquet_filter.o: $(VTABLE)/parquet_filter.cc $(VTABLE)/parquet_filter.h