[PATCH] Fixup additional search path in offload_additional_options

[Richard Biener]

This fixes the search when configured with --libexecdir=lib64,
I've adjusted the bin reference for consistency.

Testing in progress.  Does this look sensible?

2020-11-25  Richard Biener  <rguent...@suse.de>

libgomp/
        * configure: Regenerate.
        * plugin/configfrag.ac (offload_additional_options): Use
        $(libexecdir) and $(bindir) instead of hard-coding them.
---
 libgomp/configure            | 2 +-
 libgomp/plugin/configfrag.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libgomp/configure b/libgomp/configure
index e48371d5093..f130f97330f 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -15371,7 +15371,7 @@ rm -f core conftest.err conftest.$ac_objext \
     fi
     # Configure additional search paths.
     if test x"$tgt_dir" != x; then
-      offload_additional_options="$offload_additional_options 
-B$tgt_dir/libexec/gcc/\$(target_alias)/\$(gcc_version) -B$tgt_dir/bin"
+      offload_additional_options="$offload_additional_options 
-B$tgt_dir/\$(libexecdir)/gcc/\$(target_alias)/\$(gcc_version) 
-B$tgt_dir/\$(bindir)"
       
offload_additional_lib_paths="$offload_additional_lib_paths:$tgt_dir/lib64:$tgt_dir/lib:$tgt_dir/lib32"
     else
       offload_additional_options="$offload_additional_options 
-B\$(libexecdir)/gcc/\$(target_alias)/\$(gcc_version) -B\$(bindir)"
diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac
index 14030082ea8..5b6ae6c09f1 100644
--- a/libgomp/plugin/configfrag.ac
+++ b/libgomp/plugin/configfrag.ac
@@ -238,7 +238,7 @@ if test x"$enable_offload_targets" != x; then
     fi
     # Configure additional search paths.
     if test x"$tgt_dir" != x; then
-      offload_additional_options="$offload_additional_options 
-B$tgt_dir/libexec/gcc/\$(target_alias)/\$(gcc_version) -B$tgt_dir/bin"
+      offload_additional_options="$offload_additional_options 
-B$tgt_dir/\$(libexecdir)/gcc/\$(target_alias)/\$(gcc_version) 
-B$tgt_dir/\$(bindir)"
       
offload_additional_lib_paths="$offload_additional_lib_paths:$tgt_dir/lib64:$tgt_dir/lib:$tgt_dir/lib32"
     else
       offload_additional_options="$offload_additional_options 
-B\$(libexecdir)/gcc/\$(target_alias)/\$(gcc_version) -B\$(bindir)"
-- 
2.26.2