[gcc r14-7027] libgomp: Use absolute pathname to testsuite/flock [PR113192]

Jakub Jelinek jakub@gcc.gnu.org
Tue Jan 9 08:57:02 GMT 2024


https://gcc.gnu.org/g:f2e967e0257bc8188840df236595e7218b6bf748

commit r14-7027-gf2e967e0257bc8188840df236595e7218b6bf748
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Tue Jan 9 09:54:06 2024 +0100

    libgomp: Use absolute pathname to testsuite/flock [PR113192]
    
    When flock program doesn't exist, libgomp configure attempts to
    offer a fallback version using a perl script, but we weren't using
    absolute filename to that, so it apparently failed to work correctly.
    
    The following patch arranges for it to get the absolute filename.
    
    Tested by John David in the PR.
    
    2024-01-09  Jakub Jelinek  <jakub@redhat.com>
    
            PR libgomp/113192
            * configure.ac (FLOCK): Use \$(abs_top_srcdir)/testsuite/flock
            rather than $srcdir/testsuite/flock.
            * configure: Regenerated.

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

diff --git a/libgomp/configure b/libgomp/configure
index b3646c9936d..9a9d30c851d 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -16655,7 +16655,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_FLOCK="$srcdir/testsuite/flock"
+    ac_cv_prog_FLOCK="\$(abs_top_srcdir)/testsuite/flock"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
diff --git a/libgomp/configure.ac b/libgomp/configure.ac
index a42e26771b4..63129be7e3d 100644
--- a/libgomp/configure.ac
+++ b/libgomp/configure.ac
@@ -343,7 +343,7 @@ AC_MSG_NOTICE([checking for flock implementation])
 AC_CHECK_PROGS(FLOCK, flock)
 # Fallback if 'perl' is available.
 if test -z "$FLOCK"; then
-  AC_CHECK_PROG(FLOCK, perl, $srcdir/testsuite/flock)
+  AC_CHECK_PROG(FLOCK, perl, \$(abs_top_srcdir)/testsuite/flock)
 fi
 
 AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)


More information about the Gcc-cvs mailing list