--- bin/genn-buildmodel.sh	2019-04-16 17:59:16.000000000 +0100
+++ bin/genn-buildmodel.sh.new	2019-05-08 13:40:02.973103666 +0100
@@ -70,9 +70,10 @@
     GENERATOR="$GENERATOR"_coverage
 fi

-# If CUDA path isn't set, default to standard path for (at least Ubuntu) Linux systems
-# **NOTE** setting CUDA_PATH is a REQUIRED post-installation action when installing CUDA so this shouldn't be required
-export CUDA_PATH=${CUDA_PATH-/usr/local/cuda}
+if [[ -n "$DEBUG" ]]; then
+    # Set to Arch Linux default
+    CUDA_PATH=/opt/cuda
+fi

 # generate model code
 BASEDIR=$(dirname "$0")
--- src/genn/generator/MakefileCUDA	2019-04-16 17:59:16.000000000 +0100
+++ src/genn/generator/MakefileCUDA.new	2019-05-08 13:44:58.872080590 +0100
@@ -2,9 +2,9 @@
 BACKEND_NAME		:=cuda
 BACKEND_NAMESPACE 	:=CUDA

-# Check CUDA is present
 ifndef CUDA_PATH
-    $(error Environment variable CUDA_PATH must be defined)
+    # Set to Arch Linux default
+    CUDA_PATH := /opt/cuda
 endif

 # Include common makefile
--- src/spineml/generator/MakefileCUDA	2019-04-16 17:59:16.000000000 +0100
+++ src/spineml/generator/MakefileCUDA.new	2019-05-08 13:44:14.894583524 +0100
@@ -3,9 +3,9 @@
 BACKEND_NAMESPACE 	:=CUDA
 GENERATOR_NAME		:=spineml_generator_cuda

-# Check that CUDA path is set
 ifndef CUDA_PATH
-    $(error Environment variable CUDA_PATH must be defined - this is a required post-installation action when installing CUDA)
+    # Set to Arch Linux default
+    CUDA_PATH := /opt/cuda
 endif

 # Include common makefile