From: Ian Lance Taylor <iant@golang.org>
Date: Thu, 14 May 2020 19:50:30 +0000 (-0700)
Subject: libgo: only build syscall test with -static on GNU/Linux
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3a36428b5fbc825e2d3455f5770b5d6e71c63413;p=gcc.git

libgo: only build syscall test with -static on GNU/Linux

For PR go/95061

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/234019
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index b63bb3bd547..4776f78e5fa 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-93b3d88515db85e203d54f382200b84b56b0ae4c
+cae8d4c388d4cc701c7f8fc221c9f6431760d93a
 
 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 eff0e00e787..0bbe54cfe1b 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -967,9 +967,11 @@ endif
 # Also use -fno-inline to get better results from the memory profiler.
 runtime_pprof_check_GOCFLAGS = -static-libgo -fno-inline
 
+if LIBGO_IS_LINUX
 # Use -static for the syscall tests, because otherwise when
 # running as root the re-execs ignore LD_LIBRARY_PATH.
 syscall_check_GOCFLAGS = -static
+endif
 
 extra_go_files_runtime_internal_sys = version.go
 runtime/internal/sys.lo.dep: $(extra_go_files_runtime_internal_sys)
diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 872663865b8..982253d7293 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1107,7 +1107,7 @@ runtime_pprof_check_GOCFLAGS = -static-libgo -fno-inline
 
 # Use -static for the syscall tests, because otherwise when
 # running as root the re-execs ignore LD_LIBRARY_PATH.
-syscall_check_GOCFLAGS = -static
+@LIBGO_IS_LINUX_TRUE@syscall_check_GOCFLAGS = -static
 extra_go_files_runtime_internal_sys = version.go
 extra_go_files_internal_cpu = cpugen.go
 extra_go_files_golang_org_x_sys_cpu = gcpugen.go