From: Tom de Vries <tdevries@suse.de>
To: Richard Biener <rguenther@suse.de>
Cc: gcc-patches@gcc.gnu.org, Jakub Jelinek <jakub@redhat.com>
Subject: Re: [PATCH][libgomp, testsuite] Fix hardcoded libexec in plugin/configfrag.ac
Date: Mon, 28 Mar 2022 13:54:58 +0200 [thread overview]
Message-ID: <200bc2e1-4ef1-1550-c656-69b2a7a3f97f@suse.de> (raw)
In-Reply-To: <7r86pp10-o5nr-q61-3sor-p4926s5o2r0@fhfr.qr>
[-- Attachment #1: Type: text/plain, Size: 1454 bytes --]
On 3/28/22 10:49, Richard Biener wrote:
> On Mon, 28 Mar 2022, Tom de Vries wrote:
>
>> Hi,
>>
>> 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.
>>
>> OK for trunk?
>
> OK in principle, but I have no idea on how portable
>
> $(libexecdir:\$(exec_prefix)/%=%)
>
> is going to be? We should aim for POSIX shell compatibility here,
> whatever that exactly is.
I tried to avoid this construct by using shell variable substitution,
but then I end up using $(shell ...) instead, I'm not sure if that is
any better.
Thanks,
- Tom
[-- Attachment #2: 0003-libgomp-testsuite-Fix-hardcoded-libexec-in-plugin-configfrag.ac.patch --]
[-- Type: text/x-patch, Size: 3093 bytes --]
[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:
...
/$(shell dir=$(libexecdir); echo $${dir\#$(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.
---
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..081bf2d64c0 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/\$(shell dir=\$(libexecdir); echo \$\${dir\#\$(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..1eef2907bc2 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/\$(shell dir=\$(libexecdir); echo \$\${dir\#\$(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)"
next prev parent reply other threads:[~2022-03-28 11:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-28 8:45 Tom de Vries
2022-03-28 8:49 ` Richard Biener
2022-03-28 11:54 ` Tom de Vries [this message]
2022-03-28 12:00 ` Andreas Schwab
2022-03-28 12:04 ` Richard Biener
2022-03-28 12:19 ` Tom de Vries
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=200bc2e1-4ef1-1550-c656-69b2a7a3f97f@suse.de \
--to=tdevries@suse.de \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
--cc=rguenther@suse.de \
/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).