From 58920998e374bac41c6affea0284e6d1f00f5c42 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 28 Sep 2016 18:02:40 +0000 Subject: libgo: fix for runtime/check failure with "-O0 -g" Tweak the makefile rules for the runtime/check test to insure that the runtime package is compiled with "-fgo-compiling-runtime". This resolves a test failure (unsat on runtime.getcallerpc) when in a build directory where the compiler flags have been configured to disable optimization. Reviewed-on: https://go-review.googlesource.com/30010 From-SVN: r240588 --- libgo/Makefile.am | 1 + libgo/Makefile.in | 1 + 2 files changed, 2 insertions(+) (limited to 'libgo') diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 81533be..23cfd07 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1291,6 +1291,7 @@ runtime.inc: s-runtime-inc; @true s-runtime-inc: runtime-go.lo $(SHELL) $(srcdir)/mvifdiff.sh runtime.inc.tmp runtime.inc $(STAMP) $@ +runtime_check_GOCFLAGS = -fgo-compiling-runtime runtime/check: $(CHECK_DEPS) @$(CHECK) .PHONY: runtime/check diff --git a/libgo/Makefile.in b/libgo/Makefile.in index ebb7ddf..b1fb87c 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -1249,6 +1249,7 @@ CHECK_DEPS = $(toolexeclibgo_DATA) $(toolexeclibgoarchive_DATA) \ @LIBGO_IS_SOLARIS_FALSE@matchargs_os = extra_go_files_runtime = runtime_sysinfo.go runtime_go_lo_GOCFLAGS = -fgo-c-header=runtime.inc.tmp -fgo-compiling-runtime +runtime_check_GOCFLAGS = -fgo-compiling-runtime @LIBGO_IS_BSD_TRUE@golang_org_x_net_route_lo = \ @LIBGO_IS_BSD_TRUE@ golang_org/x/net/route/route.lo -- cgit v1.1