diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-04-10 10:21:19 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-04-10 10:21:19 -0700 |
| commit | 3cdc95b9f8d6c90c4a279783fd3da961c5afb22c (patch) | |
| tree | d077f53179e7b563e42ea71b385e59912a45d055 /libphobos/testsuite | |
| parent | caf99f28b0311c3ffb368819218e7ce4d245627e (diff) | |
| parent | e26bd694c790b7c8f68c6736b2683c60a8fcbcfe (diff) | |
| download | gcc-3cdc95b9f8d6c90c4a279783fd3da961c5afb22c.zip gcc-3cdc95b9f8d6c90c4a279783fd3da961c5afb22c.tar.gz gcc-3cdc95b9f8d6c90c4a279783fd3da961c5afb22c.tar.bz2 | |
Merge from trunk revision e26bd694c790b7c8f68c6736b2683c60a8fcbcfe
Diffstat (limited to 'libphobos/testsuite')
| -rw-r--r-- | libphobos/testsuite/Makefile.in | 2 | ||||
| -rw-r--r-- | libphobos/testsuite/lib/libphobos.exp | 4 | ||||
| -rwxr-xr-x | libphobos/testsuite/testsuite_flags.in | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/libphobos/testsuite/Makefile.in b/libphobos/testsuite/Makefile.in index 72e6d04..6f0eaf8 100644 --- a/libphobos/testsuite/Makefile.in +++ b/libphobos/testsuite/Makefile.in @@ -151,6 +151,7 @@ CCASFLAGS = @CCASFLAGS@ CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS = @CFLAGS@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ +CHECKING_DFLAGS = @CHECKING_DFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -216,6 +217,7 @@ SHELL = @SHELL@ SPEC_PHOBOS_DEPS = @SPEC_PHOBOS_DEPS@ STRIP = @STRIP@ VERSION = @VERSION@ +WARN_DFLAGS = @WARN_DFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/libphobos/testsuite/lib/libphobos.exp b/libphobos/testsuite/lib/libphobos.exp index 3ac0ccb..7e6e53e 100644 --- a/libphobos/testsuite/lib/libphobos.exp +++ b/libphobos/testsuite/lib/libphobos.exp @@ -162,10 +162,6 @@ proc libphobos_init { args } { append ld_library_path ":${gccdir}" } - if { [file exists "${blddir}/libdruntime/.libs/libgdruntime.${shlib_ext}"] } { - append ld_library_path ":${blddir}/libdruntime/.libs" - } - if { [file exists "${blddir}/src/.libs/libgphobos.${shlib_ext}"] } { append ld_library_path ":${blddir}/src/.libs" } diff --git a/libphobos/testsuite/testsuite_flags.in b/libphobos/testsuite/testsuite_flags.in index fa57de2..c5dcac2 100755 --- a/libphobos/testsuite/testsuite_flags.in +++ b/libphobos/testsuite/testsuite_flags.in @@ -28,7 +28,7 @@ case ${query} in ;; --gdcflags) GDCFLAGS_default="-fmessage-length=0 -fno-show-column" - GDCFLAGS_config="@GDCFLAGSX@" + GDCFLAGS_config="@WARN_DFLAGS@ @GDCFLAGSX@ -fno-release -funittest" echo ${GDCFLAGS_default} ${GDCFLAGS_config} ;; --gdcpaths) @@ -42,7 +42,6 @@ case ${query} in --gdcldflags) GDCLDFLAGS="-B${BUILD_DIR}/src -B${BUILD_DIR}/libdruntime/gcc - -L${BUILD_DIR}/libdruntime/.libs -L${BUILD_DIR}/src/.libs" echo ${GDCLDFLAGS} ;; |