summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rogers <[email protected]>2012-07-27 08:32:07 -0800
committerAndrew Boktor <[email protected]>2014-08-14 13:48:53 -0700
commitf9eaa6b1c53586f277a51f29089ff96732c9a899 (patch)
tree3415c5ccf5336c6cbfd551fbbb4e40d3b0191e22
parent3050ec4515478aad6173bc93cf1735c6a1adc8af (diff)
Fixing broken build.
Using a variable with the same name in two different bash scripts causes some issues.... Removing the redundnat declaration of THIS_DIR [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13555]
-rw-r--r--setup_environment6
1 files changed, 3 insertions, 3 deletions
diff --git a/setup_environment b/setup_environment
index c776fde..094e427 100644
--- a/setup_environment
+++ b/setup_environment
@@ -1,9 +1,9 @@
# see README before running this
export GPGPUSIM_SETUP_ENVIRONMENT_WAS_RUN=
-THIS_DIR="$( cd "$( dirname "$BASH_SOURCE" )" && pwd )"
+export GPGPUSIM_ROOT="$( cd "$( dirname "$BASH_SOURCE" )" && pwd )"
-GPGPUSIM_VERSION_STRING=`cat $THIS_DIR/version | awk '/Version/ {print $8}'`
+GPGPUSIM_VERSION_STRING=`cat $GPGPUSIM_ROOT/version | awk '/Version/ {print $8}'`
echo "GPGPU-Sim version $GPGPUSIM_VERSION_STRING";
if [ ! -n "$CUDA_INSTALL_PATH" ]; then
@@ -29,7 +29,7 @@ else
export GPGPUSIM_CONFIG=release
fi
-export GPGPUSIM_ROOT=$THIS_DIR
+
export QTINC=/usr/include