From 9a0e4e4a776a963c9950dc3dcd0d23ee0739b755 Mon Sep 17 00:00:00 2001
From: Wilson Fung <wlfung@gmail.com>
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/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index fce0f00..b20186c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -31,12 +31,11 @@
 
 DEBUG?=0
 
-CUDART_VERSION:=$(shell $(CUDA_INSTALL_PATH)/bin/nvcc --version | awk '/release/ {print $$5;}' | sed 's/,//' | sed 's/\./ /' | awk '{printf("%02u%02u", 10*int($$1), 10*$$2);}')
+include ../version_detection.mk
 
 CXXFLAGS = -Wall -DDEBUG
 CXXFLAGS += -DCUDART_VERSION=$(CUDART_VERSION)
 
-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; }')
 ifeq ($(GNUC_CPP0X), 1)
     CXXFLAGS += -std=c++0x
 endif
-- 
cgit v1.3