Fixing the conda directory.

mithro · mithro · commit 7621e47a98c9 · 2015-09-24T21:18:04.000+10:00
diff --git a/scripts/get-env.sh b/scripts/get-env.sh
@@ -83,7 +83,7 @@ fi
 echo "        Xilinx directory is: $XILINX_DIR/opt/Xilinx/"
 
 # gcc+binutils for the target
-CONDA_DIR=$SETUP_DIR/build/conda
+CONDA_DIR=$BUILD_DIR/conda
 export PATH=$CONDA_DIR/bin:$PATH
 (
 	if [ ! -d $CONDA_DIR ]; then
diff --git a/scripts/setup-env.sh b/scripts/setup-env.sh
@@ -49,7 +49,7 @@ echo "        Xilinx directory is: $XILINX_DIR/opt/Xilinx/"
 export PATH=$PATH:$XILINX_DIR/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64
 
 # gcc+binutils for the target
-CONDA_DIR=$SETUP_DIR/build/conda
+CONDA_DIR=$BUILD_DIR/conda
 export PATH=$CONDA_DIR/bin:$PATH
 
 # migen

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ fi`
`83`	`83`	`echo " Xilinx directory is: $XILINX_DIR/opt/Xilinx/"`
`84`	`84`
`85`	`85`	`# gcc+binutils for the target`
`86`		`-CONDA_DIR=$SETUP_DIR/build/conda`
	`86`	`+CONDA_DIR=$BUILD_DIR/conda`
`87`	`87`	`export PATH=$CONDA_DIR/bin:$PATH`
`88`	`88`	`(`
`89`	`89`	`if [ ! -d $CONDA_DIR ]; then`