From 4701201b5ffd382fb15ebdf508204aba4a57b27d Mon Sep 17 00:00:00 2001
From: Michael Marshall <43034299+mmphys@users.noreply.github.com>
Date: Wed, 22 Apr 2020 18:42:30 +0100
Subject: [PATCH 1/3] grid-config: Expose CXXLD (for GPU build) and update help

---
 grid-config.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/grid-config.in b/grid-config.in
index f39b01bd..5de53aa7 100755
--- a/grid-config.in
+++ b/grid-config.in
@@ -19,6 +19,8 @@ Known values for OPTION are:
   --help       display this help and exit
   --version    output version information
   --git        print git revision
+  --cxx        print c++ compiler and compiler flags
+  --cxxld      print c++ linker   and linker   flags
 
 EOF
   
@@ -65,6 +67,10 @@ while test $# -gt 0; do
       echo @GRID_CXX@
     ;;
     
+    --cxxld)
+      echo @CXXLD@
+    ;;
+    
     --ldflags)
       echo @GRID_LDFLAGS@
     ;;

From e96c86ec146c73e0386f3348cae6c0bf6e8ae094 Mon Sep 17 00:00:00 2001
From: Michael Marshall <43034299+mmphys@users.noreply.github.com>
Date: Thu, 23 Apr 2020 13:10:45 +0100
Subject: [PATCH 2/3] Make grid-config message more specific for --cxx and
 --cxxld

---
 grid-config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grid-config.in b/grid-config.in
index 5de53aa7..a12c9fdb 100755
--- a/grid-config.in
+++ b/grid-config.in
@@ -19,8 +19,8 @@ Known values for OPTION are:
   --help       display this help and exit
   --version    output version information
   --git        print git revision
-  --cxx        print c++ compiler and compiler flags
-  --cxxld      print c++ linker   and linker   flags
+  --cxx        print c++ compiler (may include some flags and spaces)
+  --cxxld      print c++ linker   (may include some flags and spaces)
 
 EOF
   

From 5daf176f4a55c144368a7229dacbc055a76ed9f0 Mon Sep 17 00:00:00 2001
From: Michael Marshall <43034299+mmphys@users.noreply.github.com>
Date: Thu, 23 Apr 2020 15:25:53 +0100
Subject: [PATCH 3/3] Updated to expose GRID_CXXLD in addition to CXXLD. NB:
 CXXLD required as this is what drives linking behaviour.

---
 configure.ac   | 2 ++
 grid-config.in | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3d4ee383..fb69ca0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -547,6 +547,7 @@ DX_INIT_DOXYGEN([$PACKAGE_NAME], [doxygen.cfg])
 ############### Ouput
 cwd=`pwd -P`; cd ${srcdir}; abs_srcdir=`pwd -P`; cd ${cwd}
 GRID_CXX="$CXX"
+GRID_CXXLD="$CXXLD"
 GRID_CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
 GRID_LDFLAGS="$AM_LDFLAGS $LDFLAGS"
 GRID_LIBS=$LIBS
@@ -561,6 +562,7 @@ AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_CXXFLAGS])
 AC_SUBST([AM_LDFLAGS])
 AC_SUBST([GRID_CXX])
+AC_SUBST([GRID_CXXLD])
 AC_SUBST([GRID_CXXFLAGS])
 AC_SUBST([GRID_LDFLAGS])
 AC_SUBST([GRID_LIBS])
diff --git a/grid-config.in b/grid-config.in
index a12c9fdb..af0816a5 100755
--- a/grid-config.in
+++ b/grid-config.in
@@ -68,7 +68,7 @@ while test $# -gt 0; do
     ;;
     
     --cxxld)
-      echo @CXXLD@
+      echo @GRID_CXXLD@
     ;;
     
     --ldflags)