diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-03-09 18:21:42 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-03-09 18:21:42 +0000 |
| commit | 300e61fa150ce9fa7bc86784aaa6baeffd174c2f (patch) | |
| tree | 4dbf3465124610f3692d71fc192ddc8361fae648 | |
| parent | 060ad85254de126c82bdbfbf6af603701ccf503c (diff) | |
| download | gcc-300e61fa150ce9fa7bc86784aaa6baeffd174c2f.tar.gz | |
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
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/Makefile.am | 1 | ||||
| -rw-r--r-- | libgo/Makefile.in | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index fd9823c9612..807609bb6b6 100644 --- 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 531f8f04d17..8f7acfe66fe 100644 --- 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 fbca83ec3af..70269c7085f 100644 --- 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 |