Skip to content
This repository was archived by the owner on Jun 20, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gcc/testsuite/gdc.test/d_do_test.exp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ proc gdc-convert-args { args } {
lappend out "-fno-bounds-check"

} elseif [string match "-boundscheck=safeonly" $arg] {
lappend out "-fbounds-check=safe"
lappend out "-fbounds-check=safeonly"

} elseif [string match "-c" $arg] {
lappend out "-c"
Expand Down
6 changes: 6 additions & 0 deletions gcc/testsuite/lib/gdc.exp
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@ proc gdc_link_flags { paths } {
if [file exists "${gccpath}/libiberty/libiberty.a"] {
append flags "-L${gccpath}/libiberty "
}
# For the tests that mix C++ and D, we should try and handle this better.
if { [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.a"] \
|| [file exists "${gccpath}/libstdc++-v3/src/.libs/libstdc++.${shlib_ext}"] } {
append flags "-L${gccpath}/libstdc++-v3/src/.libs "
append ld_library_path ":${gccpath}/libstdc++-v3/src/.libs"
}
append ld_library_path [gcc-set-multilib-library-path $GDC_UNDER_TEST]
} else {
global tool_root_dir
Expand Down