From 9a0e4e4a776a963c9950dc3dcd0d23ee0739b755 Mon Sep 17 00:00:00 2001 From: Wilson Fung Date: Thu, 26 Jul 2012 03:22:53 -0800 Subject: Clean up the unordered_map fallback support. - Now there is only one macro for all use of unordered_map in the code. - Moving all instances of gcc/cuda version detection into a single file. - Adding a warning when the fallback is triggered. [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13542] --- src/gpgpu-sim/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/gpgpu-sim/Makefile') diff --git a/src/gpgpu-sim/Makefile b/src/gpgpu-sim/Makefile index 4f636fb..fdb4503 100644 --- a/src/gpgpu-sim/Makefile +++ b/src/gpgpu-sim/Makefile @@ -38,7 +38,8 @@ else CXXFLAGS_L2CACHE = -Wall endif -GNUC_CPP0X := $(shell gcc --version | perl -ne 'if (/gcc\s+\(.*\)\s+([0-9.]+)/){ if($$1 >= 4.3) {$$n=1} else {$$n=0;} } END { print $$n; }') +include ../../version_detection.mk + ifeq ($(GNUC_CPP0X), 1) CXXFLAGS += -std=c++0x CXXFLAGS_L2CACHE += -std=c++0x -- cgit v1.3