diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-03-16 19:01:40 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-03-16 19:01:40 +0000 |
| commit | 79bf8be0a9387e45c770ca42567ca90a2f71081f (patch) | |
| tree | 39201fe42fc895961c73578ead760dc374d31dbd /libgo | |
| parent | 6e3a6db63d159bef8fce96357ed7e4d1d5957f16 (diff) | |
libgo: add runtime/pprof/internal/profile.gox to noinst_DATA
Also add noinst_DATA to CHECK_DEPS; it's not needed in practice since
`make` will build noinst_DATA, but it's logically required and will
make a difference if any of the noinst_DATA sources change between
`make` and `make check`.
Tony Reix figured out why omitting packages from noinst_DATA didn't
seem to matter: because if gccgo can't find foo.gox, it will fall back
to reading the export data in foo.o, and foo.o will exist because
these packages go into libgo.a.
Reviewed-on: https://go-review.googlesource.com/101077
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@258606 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/Makefile.am | 4 | ||||
| -rw-r--r-- | libgo/Makefile.in | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 8f7acfe66fe..7558aab8b93 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -399,7 +399,8 @@ noinst_DATA = \ internal/testenv.gox \ internal/trace.gox \ net/internal/socktest.gox \ - os/signal/internal/pty.gox + os/signal/internal/pty.gox \ + runtime/pprof/internal/profile.gox if LIBGO_IS_RTEMS rtems_task_variable_add_file = runtime/rtems-task-variable-add.c @@ -1094,6 +1095,7 @@ CHECK_DEPS = \ $(toolexeclibgotext_DATA) \ $(toolexeclibgotexttemplate_DATA) \ $(toolexeclibgounicode_DATA) \ + $(noinst_DATA) \ $(noinst_LIBRARIES) if GOC_IS_LLGO diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 70269c7085f..80c0b894053 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -758,7 +758,8 @@ toolexeclibgounicode_DATA = \ 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 zstdpkglist.go zdefaultcc.go + os/signal/internal/pty.gox runtime/pprof/internal/profile.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 @@ -1170,7 +1171,8 @@ CHECK_DEPS = $(toolexeclibgo_DATA) $(toolexeclibgoarchive_DATA) \ $(toolexeclibgoruntime_DATA) $(toolexeclibgosync_DATA) \ $(toolexeclibgotesting_DATA) $(toolexeclibgotext_DATA) \ $(toolexeclibgotexttemplate_DATA) $(toolexeclibgounicode_DATA) \ - $(noinst_LIBRARIES) $(am__append_3) $(am__append_4) + $(noinst_DATA) $(noinst_LIBRARIES) $(am__append_3) \ + $(am__append_4) # Pass -ffp-contract=off, or 386-specific options, when building the # math package. MATH_FLAG is defined in configure.ac. |