commit 6d771087e43bee3368b8ad4b4988ef1e34073d1e
author Ting Yuan <yuanting@ict.ac.cn> Sat Aug 08 15:04:31 2020 +0800
committer Than McIntosh <thanm@google.com> Mon Aug 10 17:15:59 2020 +0000
tree b614b254e53ccd8311528ca564c30d9e4f731acc
parent ce73cfd9be2cd6b530c094b849a83bb0945500ab

gollvm: set the shell variable correctly in CMakeLists.txt

Currently CMakeLists.txt in gollvm sets a work shell from SHELL environment variable. If there is no variable named SHELL in the environment, the configuration of gollvm will fail. This patch fix this issue by setting the default shell to /bin/bash.

Fixes golang/go#40631

Change-Id: Ifcd41611549134bbe5ce11373627b33eba6e75c1
Reviewed-on: https://go-review.googlesource.com/c/gollvm/+/247198
Reviewed-by: Than McIntosh <thanm@google.com>

cmake/modules/AutoGenGo.cmake

diff --git a/cmake/modules/AutoGenGo.cmake b/cmake/modules/AutoGenGo.cmake
index 7c59578..a17b62a 100644
--- a/cmake/modules/AutoGenGo.cmake
+++ b/cmake/modules/AutoGenGo.cmake
@@ -434,7 +434,11 @@
   get_filename_component(outfile "${outpath}" NAME)
   get_filename_component(outdir "${outpath}" DIRECTORY)
   set(tmpfile "${outdir}/tmp-${outfile}")
-  set(shell $ENV{SHELL})
+  if(DEFINED ENV{SHELL})
+    set(shell $ENV{SHELL})
+  else()
+    set(shell "/bin/bash")
+  endif()
 
   # Create a rule that runs the script into a temporary file.
   if( NOT ARG_CAPTURE )

cmake/modules/GoVars.cmake

diff --git a/cmake/modules/GoVars.cmake b/cmake/modules/GoVars.cmake
index 4579e70..ec6f6b2 100644
--- a/cmake/modules/GoVars.cmake
+++ b/cmake/modules/GoVars.cmake
@@ -32,9 +32,10 @@
 endif()
 
 # We need a working shell. 
-set(shell $ENV{SHELL})
-if(shell STREQUAL "")
-set(shell "/bin/bash")
+if(DEFINED ENV{SHELL})
+  set(shell $ENV{SHELL})
+else()
+  set(shell "/bin/bash")
 endif()
 execute_process(COMMAND "${shell}" "-c" "echo foo" OUTPUT_VARIABLE echofoo)
 if(echofoo STREQUAL "")