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]
---
 libopencl/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libopencl')

diff --git a/libopencl/Makefile b/libopencl/Makefile
index ae72115..d597a0d 100644
--- a/libopencl/Makefile
+++ b/libopencl/Makefile
@@ -60,7 +60,7 @@
 # Vancouver, BC V6T 1Z4
 
 
-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
 
 ifeq ($(OPENGL_SUPPORT),1) 
 	GL = -DOPENGL_SUPPORT
@@ -74,7 +74,7 @@ CCFLAGS = -O3 -g -Wall -fPIC $(GL)
 ifeq ($(DEBUG),1)
 	CCFLAGS =  -Wall -g -fPIC $(GL)
 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; }')
+
 ifeq ($(GNUC_CPP0X), 1)
     CCFLAGS += -std=c++0x
 endif
-- 
cgit v1.3