commit ce28919112dbb234366816ab39ce060ad45e8ca9

    Makefile: add internal/trace to noinst_DATA

    The internal/trace package is only imported by tests (specifically the
    tests in runtime/trace) so it must be in noinst_DATA to ensure that it
    is built before running the tests.

    This was mostly working because internal/trace has tests itself, and
    is listed in check-packages.txt before runtime/trace, so typical
    invocations of make would build internal/trace for checking purposes
    before checking runtime/trace.  But we need this change to make that
    reliable.

    Reviewed-on: https://go-review.googlesource.com/99836

From-SVN: r258392

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index fd9823c9612b124f0ac5ba733d69d13e45ca6a09..807609bb6b6779d2e947ef03ccb13d0f66daa426 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-112623c89ee42b42bc748f12d9c704615634501b
+ce28919112dbb234366816ab39ce060ad45e8ca9
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 531f8f04d1772644629e9584b953ea8ffa38da44..8f7acfe66fefcfbe8e3d2569973899b373fc611d 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -397,6 +397,7 @@ noinst_DATA = \
        golang_org/x/net/internal/nettest.gox \
        golang_org/x/net/nettest.gox \
        internal/testenv.gox \
+       internal/trace.gox \
        net/internal/socktest.gox \
        os/signal/internal/pty.gox
 

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index fbca83ec3af88db67443ca10f78fba2ec72cb07c..70269c7085fad6809e078143c0698ecc2d3aa4cb 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -757,8 +757,8 @@ toolexeclibgounicode_DATA = \
 # Force them to be built.
 noinst_DATA = golang_org/x/net/internal/nettest.gox \
        golang_org/x/net/nettest.gox internal/testenv.gox \
-       net/internal/socktest.gox os/signal/internal/pty.gox \
-       zstdpkglist.go zdefaultcc.go
+       internal/trace.gox net/internal/socktest.gox \
+       os/signal/internal/pty.gox zstdpkglist.go zdefaultcc.go
 @LIBGO_IS_RTEMS_FALSE@rtems_task_variable_add_file = 
 @LIBGO_IS_RTEMS_TRUE@rtems_task_variable_add_file = runtime/rtems-task-variable-add.c
 @LIBGO_IS_AIX_FALSE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-none.c