commit cc86c1eb0df5c07d4d882b8d86ac0dd52a44a255
author Than McIntosh <thanm@google.com> Thu May 10 12:35:29 2018 -0400
committer Than McIntosh <thanm@google.com> Wed May 16 17:31:38 2018 +0000
tree c5ff87a55fed82812a301f0510a12ac9ae943580
parent 235695ead0c57ef606fb9dd05fc0cecd062088bf

gollvm: sync libgo/gotools cmake rules with recent gofrontend change

Update the cmake rules for libgo and gotools to reflect the changes to
gofrontend in https://go-review.googlesource.com/112475 (changes how
std packages are identified).

Change-Id: I4dd2d9606dff7d10f52ab4b3b31035687f740573
Reviewed-on: https://go-review.googlesource.com/112618
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

gotools/CMakeLists.txt

diff --git a/gotools/CMakeLists.txt b/gotools/CMakeLists.txt
index dc1dde9..78df674 100644
--- a/gotools/CMakeLists.txt
+++ b/gotools/CMakeLists.txt
@@ -35,13 +35,6 @@
              ${CMAKE_C_COMPILER} ${CMAKE_CXX_COMPILER})
 copy_if_different(${cgozdefaultcctmp} ${cgozdefaultccdotgo})
 
-# Go package test needs a copy of the std package list.
-file(STRINGS "${libgo_srcroot}/libgo-packages.txt" libpackages)
-set(gozstdpkglistdotgo "${gotools_binroot}/zstdpkglist.go")
-set(gozstdpkglisttmp "${gotools_binroot}/zstdpkglist.go.tmp")
-mkzstdpkglist("load" ${gozstdpkglisttmp} ${libpackages})
-copy_if_different(${gozstdpkglisttmp} ${gozstdpkglistdotgo})
-
 set(libgo_scriptroot "${GOLLVM_SOURCE_DIR}/gofrontend/libgo")
 set(matchdotsh "${libgo_scriptroot}/match.sh")
 
@@ -160,7 +153,6 @@
        "${cmd_srcroot}/internal:src/cmd"
        "${cmd_srcroot}/go/testdata:src/cmd/go"
     "COPYFILES"
-       "${libgo_binroot}/zstdpkglist.go:src/cmd/go/internal/load"
        "${libgo_binroot}/zdefaultcc.go:src/cmd/go/internal/cfg/"
        "${libgo_binroot}/objabi.go:src/cmd/internal/objabi"
     "TIMEOUT" 200

libgo/CMakeLists.txt

diff --git a/libgo/CMakeLists.txt b/libgo/CMakeLists.txt
index 30b20d8..890cb51 100644
--- a/libgo/CMakeLists.txt
+++ b/libgo/CMakeLists.txt
@@ -99,7 +99,7 @@
 # that <pkg>_extra_go_files holds the additional sources for <pkg>.
 set(runtime_extra_go_files "runtime_sysinfo.go" "sigtab.go")
 set(cmd_internal_objabi_extra_go_files "objabi.go")
-set(cmd_go_internal_load_extra_go_files "zstdpkglist.go")
+set(go_build_extra_go_files "zstdpkglist.go")
 set(cmd_go_internal_cfg_extra_go_files "zdefaultcc.go")
 set(runtime_internal_sys_extra_go_files "version.go")
 set(go_types_extra_go_files "gccgosizes.go")
@@ -220,7 +220,7 @@
 # Rules for zstdpkglist.go
 set(zstdpkglistdotgo "${libgo_binroot}/zstdpkglist.go")
 set(zstdpkglisttmp "${libgo_binroot}/zstdpkglist.go.tmp")
-mkzstdpkglist("load" ${zstdpkglisttmp} "${libpackages}")
+mkzstdpkglist("build" ${zstdpkglisttmp} "${libpackages}")
 copy_if_different(${zstdpkglisttmp} ${zstdpkglistdotgo})
 
 # Rules for zdefaultcc.go