[Git][ghc/ghc][master] configure: Fix FIND_CXX_STD_LIB test on Darwin

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
6e3ce9a4 by Ben Gamari at 2023-03-16T12:18:26-04:00
configure: Fix FIND_CXX_STD_LIB test on Darwin

Annoyingly, Darwin's <cstddef> includes <version> and APFS is
case-insensitive. Consequently, it will end up #including the
`VERSION` file generated by the `configure` script on the second
and subsequent runs of the `configure` script.

See #23116.
- - - - -


1 changed file:

- m4/fp_find_cxx_std_lib.m4


Changes:

=====================================
m4/fp_find_cxx_std_lib.m4
=====================================
@@ -4,6 +4,14 @@
 # Identify which C++ standard library implementation the C++ toolchain links
 # against.
 AC_DEFUN([FP_FIND_CXX_STD_LIB],[
+    # Annoyingly, Darwin's <cstddef> includes <version> and APFS is
+    # case-insensitive. Consequently, it will end up #including the
+    # VERSION file generated by the configure script on the second
+    # and subsequent runs of the configure script.
+    # See #23116.
+    mkdir -p actest.tmp
+    cd actest.tmp
+
     # If this is non-empty then assume that the user has specified these
     # manually.
     if test -z "$CXX_STD_LIB_LIBS"; then
@@ -87,6 +95,9 @@ EOF
         rm -f actest.cpp actest.o actest
     fi
 
+    cd ..
+    rm -R actest.tmp
+
     AC_SUBST([CXX_STD_LIB_LIBS])
     AC_SUBST([CXX_STD_LIB_LIB_DIRS])
     AC_SUBST([CXX_STD_LIB_DYN_LIB_DIRS])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6e3ce9a4ce2509ce779102ec6f8e8ddcb676f94b

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/6e3ce9a4ce2509ce779102ec6f8e8ddcb676f94b
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230316/a95d208a/attachment-0001.html>