Commit 1c1f5c180fa8748b74123c28766306c8e2b578f6
2022-03-16T17:15:20
imported two libtool mainstream commits 28fbcb6a and b55b1cc8
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/acinclude/libtool.m4 b/acinclude/libtool.m4
index df6496e..3236dda 100644
--- a/acinclude/libtool.m4
+++ b/acinclude/libtool.m4
@@ -1068,7 +1068,7 @@ _LT_EOF
darwin1.*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*)
- case ${MACOSX_DEPLOYMENT_TARGET},$host in
+ case $MACOSX_DEPLOYMENT_TARGET,$host in
10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
*)
diff --git a/build-scripts/ltmain.sh b/build-scripts/ltmain.sh
index c10d13d..70a3e82 100644
--- a/build-scripts/ltmain.sh
+++ b/build-scripts/ltmain.sh
@@ -7081,8 +7081,20 @@ func_mode_link ()
prev=xcompiler
continue
;;
-
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199.
+ -pthread)
+ case $host in
+ *solaris2*) ;;
+ *)
+ case "$new_inherited_linker_flags " in
+ *" $arg "*) ;;
+ * ) func_append new_inherited_linker_flags " $arg" ;;
+ esac
+ ;;
+ esac
+ continue
+ ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
func_append compiler_flags " $arg"
func_append compile_command " $arg"
diff --git a/configure b/configure
index 54a550c..df73ab0 100755
--- a/configure
+++ b/configure
@@ -7124,7 +7124,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
darwin1.*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*)
- case ${MACOSX_DEPLOYMENT_TARGET},$host in
+ case $MACOSX_DEPLOYMENT_TARGET,$host in
10.[012],*|,*powerpc*-darwin[5-8]*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
*)