summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTayler Hetherington <[email protected]>2013-03-24 13:02:34 -0800
committerAndrew Boktor <[email protected]>2014-08-14 13:50:06 -0700
commit13c2654444c4a4da494e91be8bba7d4192cc640f (patch)
tree9a282443f2eee4be7d511548ea0059643f417bcd /src
parent1a79a6c54cbd2a7b75ebc1ab7fd6d449f18197f8 (diff)
Fixing GPUWattch McPAT Makefile to use -m32 for 32 bit and -m64 for 64 bit Linux
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 15583]
Diffstat (limited to 'src')
-rw-r--r--src/gpuwattch/mcpat.mk18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/gpuwattch/mcpat.mk b/src/gpuwattch/mcpat.mk
index 22511e5..1a9405d 100644
--- a/src/gpuwattch/mcpat.mk
+++ b/src/gpuwattch/mcpat.mk
@@ -11,6 +11,17 @@ endif
LIBS =
INCS = -lm
+CC=
+CXX=
+
+ifeq ($(shell getconf LONG_BIT),64)
+ CXX = g++ -m64
+ CC = gcc -m64
+else
+ CXX = g++ -m32
+ CC = gcc -m32
+endif
+
ifeq ($(TAG),dbg)
DBG = -Wall
OPT = -ggdb -fPIC -g -O0 -DNTHREADS=1 -Icacti -lz
@@ -22,10 +33,9 @@ endif
#CXXFLAGS = -Wall -Wno-unknown-pragmas -Winline $(DBG) $(OPT)
CXXFLAGS = -Wno-unknown-pragmas $(DBG) $(OPT)
-#CXX = g++ -m32
-CXX = g++ -m64
-#CC = gcc -m32
-CC = gcc -m64
+
+
+
VPATH = cacti