diff --git a/src/test/confidence/testenv.sh b/src/test/confidence/testenv.sh
index fdb13cc2..e0a157ee 100755
--- a/src/test/confidence/testenv.sh
+++ b/src/test/confidence/testenv.sh
@@ -17,5 +17,5 @@ rm -f *.o *.obj *.exe *.sym *.c *.h result new.asm $(basename "$PWD")
 # NOTE: The cygwin 64 bit build has relocation errors with
 # these assembly generation options.
 if [ "$COMPILER" = "gcc" -a "$FLAVOUR" != "cygwin.LP64.gcc" ]
-then export CFLAGS="-gstabs -g1 -Wa,-acdhln=new.asm -Wl,-Map=output.map"
+then export CFLAGS="-g1 -Wa,-acdhln=new.asm -Wl,-Map=output.map"
 fi
diff --git a/src/tools/make/configure.c b/src/tools/make/configure.c
index ecfc3f1f..459b6836 100644
--- a/src/tools/make/configure.c
+++ b/src/tools/make/configure.c
@@ -141,7 +141,11 @@ void determineCCompiler() {
     compiler = "tcc";
     cc       = "tcc -g";
     staticlink = "";
-  #elif defined(__GNUC__)
+  #elif defined(__NVCC__)
+    compiler = "nvcc";
+    cc       = "nvcc -g --compiler-options -fPIC";
+    staticlink = "";
+   #elif defined(__GNUC__)
     compiler = "gcc";
     if (strncasecmp(os, "cygwin",  6) == 0) {
       // Avoid cygwin specific warning that -fPIC is ignored.