setop
/
sqlite-parquet-vtable
mirror of https://github.com/cldellow/sqlite-parquet-vtable.git
1
0
Fork 0
Code Releases Activity

travis: don't stomp CC in Makefile

This commit is contained in:
Colin Dellow 2018-07-05 09:09:18 -04:00
parent f87d823607
commit efb22c5c5a
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/Makefile.linux
View File

@ -39,7 +39,8 @@ ZLIB_LIB = $(ZLIB)/libz.a
ZSTD_LIB = $(ZSTD)/libzstd.a ZSTD_LIB = $(ZSTD)/libzstd.a
# Flags # Flags
CC = g++ CC = gcc
CXX = g++
CPUS:=$(shell nproc) CPUS:=$(shell nproc)
CFLAGS = -I $(SQLITE) -I $(PARQUET_CPP)/src -I $(ARROW)/cpp/src -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
@ -56,19 +57,19 @@ LIBS = $(ARROW_LIB) $(PARQUET_CPP_LIB) $(ICU_I18N_LIB)
PROF = PROF =
libparquet.so: $(LIBS) $(OBJ) libparquet.so: $(LIBS) $(OBJ)
$(CC) $(PROF) -shared -o $@ $(OBJ) $(LDFLAGS) $(CXX) $(PROF) -shared -o $@ $(OBJ) $(LDFLAGS)
parquet_filter.o: $(VTABLE)/parquet_filter.cc $(VTABLE)/parquet_filter.h $(ARROW) $(PARQUET_CPP) parquet_filter.o: $(VTABLE)/parquet_filter.cc $(VTABLE)/parquet_filter.h $(ARROW) $(PARQUET_CPP)
$(CC) $(PROF) -c -o $@ $< $(CFLAGS) $(CXX) $(PROF) -c -o $@ $< $(CFLAGS)
parquet_cursor.o: $(VTABLE)/parquet_cursor.cc $(VTABLE)/parquet_cursor.h $(VTABLE)/parquet_table.h $(VTABLE)/parquet_filter.h $(ARROW) $(PARQUET_CPP) parquet_cursor.o: $(VTABLE)/parquet_cursor.cc $(VTABLE)/parquet_cursor.h $(VTABLE)/parquet_table.h $(VTABLE)/parquet_filter.h $(ARROW) $(PARQUET_CPP)
$(CC) $(PROF) -c -o $@ $< $(CFLAGS) $(CXX) $(PROF) -c -o $@ $< $(CFLAGS)
parquet_table.o: $(VTABLE)/parquet_table.cc $(VTABLE)/parquet_table.h $(ARROW) $(PARQUET_CPP) parquet_table.o: $(VTABLE)/parquet_table.cc $(VTABLE)/parquet_table.h $(ARROW) $(PARQUET_CPP)
$(CC) $(PROF) -c -o $@ $< $(CFLAGS) $(CXX) $(PROF) -c -o $@ $< $(CFLAGS)
parquet.o: $(VTABLE)/parquet.cc $(VTABLE)/parquet_cursor.h $(VTABLE)/parquet_table.h $(VTABLE)/parquet_filter.h $(ARROW) $(PARQUET_CPP) parquet.o: $(VTABLE)/parquet.cc $(VTABLE)/parquet_cursor.h $(VTABLE)/parquet_table.h $(VTABLE)/parquet_filter.h $(ARROW) $(PARQUET_CPP)
$(CC) $(PROF) -c -o $@ $< $(CFLAGS) $(CXX) $(PROF) -c -o $@ $< $(CFLAGS)
$(ARROW): $(ARROW):
rm -rf $(ARROW) rm -rf $(ARROW)

5
travis-linux
View File

@ -1,11 +1,6 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -euo pipefail
echo "CC is ${CC:-unknown}"
echo "CXX is ${CXX:-unknown}"
export CC=gcc
export CXX=g++
sudo apt-get install software-properties-common sudo apt-get install software-properties-common
sudo add-apt-repository --yes ppa:george-edison55/cmake-3.x sudo add-apt-repository --yes ppa:george-edison55/cmake-3.x
sudo apt-get update sudo apt-get update