commit 862d47dd92491f3bc5064235755fa3de05a07174
author Than McIntosh <thanm@google.com> Wed Jan 30 15:17:26 2019 -0500
committer Than McIntosh <thanm@google.com> Fri Feb 08 14:32:46 2019 +0000
tree 8aa6a84b6bec9cc84c5065ee82d1ccd9d328eb78
parent aa21d5760b0a9e06da124692267a9166f16afba5

gollvm: cmake rules bugfix for GOLLVM_EXTRA_GOCFLAGS

Tweak to the cmake rules to insure that the GOLLVM_EXTRA_GOCFLAGS
feature works correctly when set to more than one flag, e.g.

  cmake .. -DGOLLVM_EXTRA_GOCFLAGS='-O3 -fdebug-info-for-profiling' ...

Change-Id: I88762dcfab4c7b98b5116839f3f5619b536aa354
Reviewed-on: https://go-review.googlesource.com/c/160481
Reviewed-by: Cherry Zhang <cherryyz@google.com>

gotools/CMakeLists.txt

diff --git a/gotools/CMakeLists.txt b/gotools/CMakeLists.txt
index 567747b..c5d5420 100644
--- a/gotools/CMakeLists.txt
+++ b/gotools/CMakeLists.txt
@@ -13,7 +13,10 @@
 
 # Pick up any extra Go compiler flags specified via
 # "cmake -DGOLLVM_EXTRA_GOCFLAGS=..."
-set(gotools_extra_gocflags ${GOLLVM_EXTRA_GOCFLAGS})
+set(tmp_gotools_extra_gocflags ${GOLLVM_EXTRA_GOCFLAGS})
+if(GOLLVM_EXTRA_GOCFLAGS)
+  string(REPLACE " " ";" gotols_extra_gocflags ${tmp_gotools_extra_gocflags})
+endif()
 if(NOT GOLLVM_USE_SPLIT_STACK)
   list(APPEND gotools_extra_gocflags "-fno-split-stack")
 endif()

libgo/CMakeLists.txt

diff --git a/libgo/CMakeLists.txt b/libgo/CMakeLists.txt
index 009d1d6..04497c1 100644
--- a/libgo/CMakeLists.txt
+++ b/libgo/CMakeLists.txt
@@ -78,7 +78,10 @@
 
 # Pick up any extra Go compiler flags specified via
 # "cmake -DGOLLVM_EXTRA_GOCFLAGS=..."
-set(libgo_extra_gocflags ${GOLLVM_EXTRA_GOCFLAGS})
+set(tmp_libgo_extra_gocflags ${GOLLVM_EXTRA_GOCFLAGS})
+if(GOLLVM_EXTRA_GOCFLAGS)
+  string(REPLACE " " ";" libgo_extra_gocflags ${tmp_libgo_extra_gocflags})
+endif()
 if(NOT GOLLVM_USE_SPLIT_STACK)
   list(APPEND libgo_extra_gocflags "-fno-split-stack")
 endif()