From b3cd4d5f7f936a1cd0c5c5c8b360db47a29fc23e Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 10 May 2021 20:07:08 +0200 Subject: [PATCH] removed definition of CXX and CXXFLAGS from Makefile --- src/Makefile | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/Makefile b/src/Makefile index 058a006..683b0d1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,23 +3,12 @@ objfiles:=$(patsubst %.cpp,%.o,$(sourcefiles)) -CXX = g++10 -#CXX = clang++ -#CXXFLAGS = -fsanitize=address -O0 -g3 -gdwarf-2 -O0 -std=c++14 -I../ttmath -I../pikotools -Wl,-rpath=/usr/local/lib/gcc5/ -Wall -pedantic -Wextra -#CXXFLAGS = -O0 -g3 -gdwarf-2 -O0 -std=c++17 -I../ttmath -I../pikotools -Wl,-rpath=/usr/local/lib/gcc7/ -Wall -pedantic -Wextra -CXXFLAGS = -Wl,-rpath=/usr/local/lib/gcc10/ -O0 -g3 -std=c++20 -I../pikotools -Wall -pedantic - - ifndef CXX -CXX = clang++ +CXX = g++ endif ifndef CXXFLAGS -CXXFLAGS = -Wall -O2 -I/usr/local/include -endif - -ifndef LDFLAGS -LDFLAGS = -L/usr/local/lib +CXXFLAGS = -Wall -pedantic -O2 -std=c++20 -I../src -I/usr/local/include endif ifndef AR @@ -27,10 +16,6 @@ AR = ar endif -#export CXX -#export CXXFLAGS -#export LDFLAGS -#export AR libname = pikotools.a