Merge 2.5.x changes into trunk.

2025-09-30 11:44:32 +03:00 · 2009-06-15 21:14:30 +00:00
parent e5becf8407
commit 05bd243347
8 changed files with 67 additions and 60 deletions
--- a/apache2/build/apxs-wrapper.in
+++ b/apache2/build/apxs-wrapper.in
@@ -5,6 +5,9 @@ for opt in "$@"; do
    case "$opt" in
        # Fix for -R not working w/apxs
        -R*) WRAPPED_OPTS="$WRAPPED_OPTS -Wl,$opt" ;;
+        # OSF1 compiler option
+        -pthread) WRAPPED_OPTS="$WRAPPED_OPTS -Wc,$opt" ;;
+        # Unwrapped
        *) WRAPPED_OPTS="$WRAPPED_OPTS $opt" ;;
    esac
 done