diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-05-13 11:12:01 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-05-13 11:45:55 -0700 |
| commit | 0d5d880994660e231f82b7cb1dcfab744158f7e0 (patch) | |
| tree | a1234ab5ae870bd9caf82df9a274c8d8462761e0 | |
| parent | d2ec2786827e41a872276c88fb5d68c24e13ec46 (diff) | |
| download | gcc-0d5d880994660e231f82b7cb1dcfab744158f7e0.zip gcc-0d5d880994660e231f82b7cb1dcfab744158f7e0.tar.gz gcc-0d5d880994660e231f82b7cb1dcfab744158f7e0.tar.bz2 | |
libgo: build syscall test with -static
This avoids problems finding libgo.so when running the test as root,
which invokes the test as a child process in various limited environments.
Fixes PR go/95061
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/233897
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/Makefile.am | 4 | ||||
| -rw-r--r-- | libgo/Makefile.in | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 02f6746..b63bb3b 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -876bdf3df3bb33dbf1414237d84be5da32a48082 +93b3d88515db85e203d54f382200b84b56b0ae4c 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 dea09de..eff0e00 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -967,6 +967,10 @@ endif # Also use -fno-inline to get better results from the memory profiler. 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 + 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 607b88c..8726638 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -1104,6 +1104,10 @@ runtime_internal_sys_lo_check_GOCFLAGS = -fgo-compiling-runtime # otherwise we can't get the line numbers. # Also use -fno-inline to get better results from the memory profiler. 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 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 |