From 838373111f611ef374b196d16285cd26716737f3 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Tue, 21 May 2019 04:37:45 +0000 Subject: [PATCH] tbb-backend effective target should check ability to link TBB PR libstdc++/90252 * testsuite/lib/libstdc++.exp (check_effective_target_tbb-backend): Changed v3_target_compile check from preprocess to executable. Added "-ltbb" to v3_target_compile flags. From-SVN: r271451 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/testsuite/lib/libstdc++.exp | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5633216ca3d..79318f762d8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2019-05-20 Thomas Rodgers + + PR libstdc++/90252 + * testsuite/lib/libstdc++.exp (check_effective_target_tbb-backend): + Changed v3_target_compile check from preprocess to executable. + Added "-ltbb" to v3_target_compile flags. + 2019-05-20 Thomas Rodgers * testsuite/lib/libstdc++.exp (check_effective_target_tbb-backend): diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 011630f6d32..26f3d46e089 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -1586,15 +1586,20 @@ proc check_effective_target_tbb-backend { } { # Set up and preprocess a C++ test program that depends # on tbb set src tbb_backend[pid].cc - + set exe tbb_backend[pid].x + set f [open $src "w"] puts $f "#include " puts $f "#if TBB_INTERFACE_VERSION < 10000" puts $f "# error Intel(R) Threading Building Blocks 2018 is required; older versions are not supported." puts $f "#endif" + puts $f "int main ()" + puts $f "{" + puts $f " return 0;" + puts $f "}" close $f - set lines [v3_target_compile $src /dev/null preprocess ""] + set lines [v3_target_compile $src $exe executable "-ltbb"] file delete $src if [string match "" $lines] { -- 2.30.2