Commit 300e61fa by Ian Lance Taylor

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
parent 060ad852
112623c89ee42b42bc748f12d9c704615634501b ce28919112dbb234366816ab39ce060ad45e8ca9
The first line of this file holds the git revision number of the last The first line of this file holds the git revision number of the last
merge done from the gofrontend repository. merge done from the gofrontend repository.
...@@ -397,6 +397,7 @@ noinst_DATA = \ ...@@ -397,6 +397,7 @@ noinst_DATA = \
golang_org/x/net/internal/nettest.gox \ golang_org/x/net/internal/nettest.gox \
golang_org/x/net/nettest.gox \ golang_org/x/net/nettest.gox \
internal/testenv.gox \ internal/testenv.gox \
internal/trace.gox \
net/internal/socktest.gox \ net/internal/socktest.gox \
os/signal/internal/pty.gox os/signal/internal/pty.gox
......
...@@ -757,8 +757,8 @@ toolexeclibgounicode_DATA = \ ...@@ -757,8 +757,8 @@ toolexeclibgounicode_DATA = \
# Force them to be built. # Force them to be built.
noinst_DATA = golang_org/x/net/internal/nettest.gox \ noinst_DATA = golang_org/x/net/internal/nettest.gox \
golang_org/x/net/nettest.gox internal/testenv.gox \ golang_org/x/net/nettest.gox internal/testenv.gox \
net/internal/socktest.gox os/signal/internal/pty.gox \ internal/trace.gox net/internal/socktest.gox \
zstdpkglist.go zdefaultcc.go os/signal/internal/pty.gox zstdpkglist.go zdefaultcc.go
@LIBGO_IS_RTEMS_FALSE@rtems_task_variable_add_file = @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_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 @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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment