From efb22c5c5a3901d5336e5949a5e5c85b12547c55 Mon Sep 17 00:00:00 2001 From: Colin Dellow Date: Thu, 5 Jul 2018 09:09:18 -0400 Subject: [PATCH] travis: don't stomp CC in Makefile --- build/Makefile.linux | 13 +++++++------ travis-linux | 5 ----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/build/Makefile.linux b/build/Makefile.linux index 37b0579..7a73a50 100644 --- a/build/Makefile.linux +++ b/build/Makefile.linux @@ -39,7 +39,8 @@ ZLIB_LIB = $(ZLIB)/libz.a ZSTD_LIB = $(ZSTD)/libzstd.a # Flags -CC = g++ +CC = gcc +CXX = g++ CPUS:=$(shell nproc) 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 = 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) - $(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) - $(CC) $(PROF) -c -o $@ $< $(CFLAGS) + $(CXX) $(PROF) -c -o $@ $< $(CFLAGS) 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) - $(CC) $(PROF) -c -o $@ $< $(CFLAGS) + $(CXX) $(PROF) -c -o $@ $< $(CFLAGS) $(ARROW): rm -rf $(ARROW) diff --git a/travis-linux b/travis-linux index 7b117ab..2b768db 100755 --- a/travis-linux +++ b/travis-linux @@ -1,11 +1,6 @@ #!/bin/bash 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 add-apt-repository --yes ppa:george-edison55/cmake-3.x sudo apt-get update