public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Tom de Vries <vries@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-7847] [libgomp, testsuite] Fix hardcoded libexec in plugin/configfrag.ac
Date: Mon, 28 Mar 2022 12:10:37 +0000 (GMT)	[thread overview]
Message-ID: <20220328121037.4BA803858C56@sourceware.org> (raw)

https://gcc.gnu.org/g:52f42dce15f036a140154aa339fa1709c5cc858b

commit r12-7847-g52f42dce15f036a140154aa339fa1709c5cc858b
Author: Tom de Vries <tdevries@suse.de>
Date:   Mon Mar 28 10:45:45 2022 +0200

    [libgomp, testsuite] Fix hardcoded libexec in plugin/configfrag.ac
    
    When building an nvptx offloading configuration on openSUSE Leap 15.3, the
    site script /usr/share/site/x86_64-unknown-linux-gnu is activated, setting
    libexecdir to ${exec_prefix}/lib rather than ${exec_prefix}/libexec:
    ...
    | # If user did not specify libexecdir, set the correct target:
    | # Nor FHS nor openSUSE allow prefix/libexec. Let's default to prefix/lib.
    |
    | if test "$libexecdir" = '${exec_prefix}/libexec' ; then
    |       libexecdir='${exec_prefix}/lib'
    | fi
    ...
    
    However, in libgomp libgomp/plugin/configfrag.ac we hardcode libexec:
    ...
        # 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"
    ...
    
    Fix this by using /$(libexecdir:\$(exec_prefix)/%=%)/ instead of /libexec/.
    
    Tested on x86_64-linux with nvptx accelerator.
    
    libgomp/ChangeLog:
    
    2022-03-28  Tom de Vries  <tdevries@suse.de>
    
            * plugin/configfrag.ac: Use /$(libexecdir:\$(exec_prefix)/%=%)/
            instead of /libexec/.
            * configure: Regenerate.

Diff:
---
 libgomp/configure            | 2 +-
 libgomp/plugin/configfrag.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libgomp/configure b/libgomp/configure
index a73a6d44003..bdbe3d142d1 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -15419,7 +15419,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:\$(exec_prefix)/%=%)/gcc/\$(target_alias)/\$(gcc_version) -B$tgt_dir/bin"
       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 da573bd8387..9f9d0a7f08c 100644
--- a/libgomp/plugin/configfrag.ac
+++ b/libgomp/plugin/configfrag.ac
@@ -254,7 +254,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:\$(exec_prefix)/%=%)/gcc/\$(target_alias)/\$(gcc_version) -B$tgt_dir/bin"
       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)"


                 reply	other threads:[~2022-03-28 12:10 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220328121037.4BA803858C56@sourceware.org \
    --to=vries@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).