Evolinx/gcc
Evolinx/gcc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgo: fix DejaGNU testsuite compiler when using build sysroot

Browse Source 
Patch from Thomas Schwinge.

PR testsuite/109951
* configure.ac: 'AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)'.
* Makefile.in: Regenerate.
* configure: Likewise.
* testsuite/Makefile.in: Likewise.
* testsuite/lib/libgo.exp (libgo_init): If
'--with-build-sysroot=[...]' was specified, use it for build-tree
testing.
* testsuite/libgo-test-support.exp.in (GOC_UNDER_TEST): Don't set.
(SYSROOT_CFLAGS_FOR_TARGET): Set.

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/527755
This commit is contained in:
Ian Lance Taylor 2023-09-12 09:11:48 -07:00
parent f73d2d61a5
commit 08dfde5a30
7 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -1,4 +1,4 @@
53cdfab53ce79d8dfc1df01a696d4ffc43f17c3d
967a215d6419c3db58f8f59a0c252c458abce395
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

1
libgo/Makefile.in
View File

@ -474,6 +474,7 @@ SPLIT_STACK = @SPLIT_STACK@
STRINGOPS_FLAG = @STRINGOPS_FLAG@
STRIP = @STRIP@
STRUCT_EPOLL_EVENT_FD_OFFSET = @STRUCT_EPOLL_EVENT_FD_OFFSET@
SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
USE_DEJAGNU = @USE_DEJAGNU@
VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@

7
libgo/configure vendored
View File

@ -633,6 +633,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
SYSROOT_CFLAGS_FOR_TARGET
HAVE_STATIC_LINK_FALSE
HAVE_STATIC_LINK_TRUE
HAVE_STAT_TIMESPEC_FALSE
@ -11544,7 +11545,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11547 "configure"
#line 11548 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11650,7 +11651,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11653 "configure"
#line 11654 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -16147,6 +16148,8 @@ else
fi
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure

2
libgo/configure.ac
View File

@ -913,6 +913,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(,)],
LDFLAGS=$LDFLAGS_hold])
AM_CONDITIONAL(HAVE_STATIC_LINK, test "$libgo_cv_ld_static" = yes)
AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)
AC_CACHE_SAVE
if test ${multilib} = yes; then

1
libgo/testsuite/Makefile.in
View File

@ -223,6 +223,7 @@ SPLIT_STACK = @SPLIT_STACK@
STRINGOPS_FLAG = @STRINGOPS_FLAG@
STRIP = @STRIP@
STRUCT_EPOLL_EVENT_FD_OFFSET = @STRUCT_EPOLL_EVENT_FD_OFFSET@
SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
USE_DEJAGNU = @USE_DEJAGNU@
VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@

8
libgo/testsuite/lib/libgo.exp
View File

@ -53,5 +53,13 @@ load_gcc_lib timeout.exp
load_gcc_lib go.exp
proc libgo_init { args } {
global TESTING_IN_BUILD_TREE
if { [info exists TESTING_IN_BUILD_TREE] } {
# If '--with-build-sysroot=[...]' was specified, use it for build-tree
# testing.
global TEST_ALWAYS_FLAGS SYSROOT_CFLAGS_FOR_TARGET
set TEST_ALWAYS_FLAGS $SYSROOT_CFLAGS_FOR_TARGET
}
go_init $args
}

2
libgo/testsuite/libgo-test-support.exp.in
View File

@ -14,4 +14,4 @@
# along with GCC; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
set GOC_UNDER_TEST {@GOC@}
set SYSROOT_CFLAGS_FOR_TARGET {@SYSROOT_CFLAGS_FOR_TARGET@}