libgo, gotools: add libgobegin dependency to gotools and test targets
libgobegin is needed for building the go tools and the tests.
Change-Id: If999d81ff5c1935ccfb23f0f9079a87ecfae664e
Reviewed-on: https://go-review.googlesource.com/c/141178
Reviewed-by: Than McIntosh <thanm@google.com>
diff --git a/gotools/CMakeLists.txt b/gotools/CMakeLists.txt
index fdb70aa..1d947dd 100644
--- a/gotools/CMakeLists.txt
+++ b/gotools/CMakeLists.txt
@@ -82,7 +82,7 @@
GOLIB ${libgotool_archive}
GOCFLAGS ${gotools_extra_gocflags}
ISUBDIR ${isubdir}
- GODEP libgotool libgo_shared libgo_static)
+ GODEP libgotool libgo_shared libgo_static libgobegin)
list(APPEND allgotools ${tool_target})
endif()
endforeach()
@@ -165,7 +165,7 @@
"GOC" "${rungoc}"
"BINDIR" ${gotools_binroot}
"LIBDIR" ${libgo_binroot}
- DEPENDS ${libgo_goxfiles} libgotool libgo_shared gotools_all
+ DEPENDS ${libgo_goxfiles} libgotool libgo_shared gotools_all libgobegin libgolibbegin
${libgo_binroot}/zstdpkglist.go ${libgo_binroot}/zdefaultcc.go
COMMENT "Checking cmd/go tool"
VERBATIM)
@@ -188,7 +188,7 @@
"GOC" "${rungoc}"
"BINDIR" ${gotools_binroot}
"LIBDIR" ${libgo_binroot}
- DEPENDS ${libgo_goxfiles} libgotool libgo_shared gotools_all
+ DEPENDS ${libgo_goxfiles} libgotool libgo_shared gotools_all libgobegin
COMMENT "Checking cmd/vet tool"
VERBATIM)
list(APPEND checktargets ${targetname})
@@ -207,7 +207,7 @@
"SETENV" "GOTRACEBACK=2"
"BINDIR" ${gotools_binroot}
"LIBDIR" ${libgo_binroot}
- DEPENDS ${libgo_goxfiles} libgotool libgo_shared gotools_all
+ DEPENDS ${libgo_goxfiles} libgotool libgo_shared gotools_all libgobegin
COMMENT "Checking cmd/cgo tool"
VERBATIM)
list(APPEND checktargets ${targetname})
@@ -227,7 +227,7 @@
"TESTARG" "carchive_test.go"
"BINDIR" ${gotools_binroot}
"LIBDIR" ${libgo_binroot}
- DEPENDS ${libgo_goxfiles} libgotool libgo_shared gotools_all
+ DEPENDS ${libgo_goxfiles} libgotool libgo_shared gotools_all libgobegin libgolibbegin
COMMENT "Checking cmd/carchive tool"
VERBATIM)
list(APPEND checktargets ${targetname})
@@ -251,7 +251,7 @@
"GOLIBS" ${packlibs} ${extralibs}
"BINDIR" "${libgo_binroot}"
"BASEDIR" "${libgo_srcroot}"
- DEPENDS libgotool libgo_shared libgo_static gotools_all
+ DEPENDS libgotool libgo_shared libgo_static gotools_all libgobegin
COMMENT "Checking runtime package with 'go' tool"
VERBATIM)
list(APPEND checktargets ${targetname})
diff --git a/libgo/CMakeLists.txt b/libgo/CMakeLists.txt
index 543eaaa..9945d9c 100644
--- a/libgo/CMakeLists.txt
+++ b/libgo/CMakeLists.txt
@@ -605,7 +605,7 @@
"GOLIBS" ${packlibs} ${extralibs}
"BINDIR" "${libgo_binroot}"
"BASEDIR" "${libgo_srcroot}"
- DEPENDS ${libgo_goxfiles} libgotool libgo_shared libgo_static
+ DEPENDS ${libgo_goxfiles} libgotool libgo_shared libgo_static libgobegin
COMMENT "Checking Go package ${pack}"
VERBATIM)
list(APPEND checktargets ${targetname})