From c846c8bb60d08c0813a2b45d3a49575d1fae7461 Mon Sep 17 00:00:00 2001 From: paoletti <paoletti@umich.edu> Date: Wed, 6 Jan 2016 12:10:07 -0500 Subject: [PATCH] Changed to gcc-5.1.0 and c++14 --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 26104d6..36ed23d 100644 --- a/Makefile +++ b/Makefile @@ -40,10 +40,10 @@ # Version 1 - 2014-09-21, David Snider (sniderdj@umich.edu) # Vertion 0 - ????-??-??, Matt Diffenderfer (mjdiffy@umich.edu) -# enables c++11 on CAEN -PATH := /usr/um/gcc-4.8.3/bin:$(PATH) -LD_LIBRARY_PATH := /usr/um/gcc-4.8.3/lib64 -LD_RUN_PATH := /usr/um/gcc-4.8.3/lib64 +# enables c++14 on CAEN +PATH := /usr/um/gcc-5.1.0/bin:$(PATH) +LD_LIBRARY_PATH := /usr/um/gcc-5.1.0/lib64 +LD_RUN_PATH := /usr/um/gcc-5.1.0/lib64 # TODO # Change EXECUTABLE to match the command name given in the project spec. @@ -75,7 +75,7 @@ PARTIAL_SUBMITFILE = partialsubmit.tar.gz FULL_SUBMITFILE = fullsubmit.tar.gz #Default Flags -CXXFLAGS = -std=c++11 -Wall -Werror -Wextra -pedantic +CXXFLAGS = -std=c++14 -Wall -Werror -Wextra -pedantic # make release - will compile "all" with $(CXXFLAGS) and the -O3 flag # also defines NDEBUG so that asserts will not check -- GitLab