Rename CC and CFLAGS to CXX and CXXFLAGS in OpenMP

This commit is contained in:
James Price 2017-02-23 15:54:36 +00:00
parent 6b26e33dcd
commit d19cf1a5af

View File

@ -8,14 +8,14 @@ COMPILER_GNU = g++
COMPILER_INTEL = icpc COMPILER_INTEL = icpc
COMPILER_CRAY = CC COMPILER_CRAY = CC
COMPILER_CLANG = clang++ COMPILER_CLANG = clang++
CC = $(COMPILER_$(COMPILER)) CXX = $(COMPILER_$(COMPILER))
FLAGS_ = -O3 FLAGS_ = -O3
FLAGS_GNU = -O3 -std=c++11 FLAGS_GNU = -O3 -std=c++11
FLAGS_INTEL = -O3 -std=c++11 FLAGS_INTEL = -O3 -std=c++11
FLAGS_CRAY = -O3 -hstd=c++11 FLAGS_CRAY = -O3 -hstd=c++11
FLAGS_CLANG = -O3 -std=c++11 FLAGS_CLANG = -O3 -std=c++11
CFLAGS = $(FLAGS_$(COMPILER)) CXXFLAGS = $(FLAGS_$(COMPILER))
OMP_ = OMP_ =
OMP_GNU = -fopenmp OMP_GNU = -fopenmp
@ -29,8 +29,8 @@ OMP_TARGET_CLANG = -fopenmp=libomp -fopenmp-targets=nvptx64-nvidia-cuda
OMP_TARGET = $(OMP_TARGET_$(COMPILER)) OMP_TARGET = $(OMP_TARGET_$(COMPILER))
omp-stream: main.cpp OMPStream.cpp omp-stream: main.cpp OMPStream.cpp
$(CC) $(CFLAGS) -DOMP $^ $(OMP) $(EXTRA_FLAGS) -o $@ $(CXX) $(CXXFLAGS) -DOMP $^ $(OMP) $(EXTRA_FLAGS) -o $@
omp-target-stream: main.cpp OMPStream.cpp omp-target-stream: main.cpp OMPStream.cpp
$(CC) $(CFLAGS) -DOMP -DOMP_TARGET_GPU $^ $(OMP_TARGET) $(EXTRA_FLAGS) -o $@ $(CXX) $(CXXFLAGS) -DOMP -DOMP_TARGET_GPU $^ $(OMP_TARGET) $(EXTRA_FLAGS) -o $@