summaryrefslogtreecommitdiff
path: root/src/lib/libssl/src/config
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/src/config')
-rw-r--r--src/lib/libssl/src/config13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config
index b3bd96bbfc..25a3703c1f 100644
--- a/src/lib/libssl/src/config
+++ b/src/lib/libssl/src/config
@@ -134,7 +134,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
134 HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'` 134 HPUXVER=`echo ${RELEASE}|sed -e 's/[^.]*.[0B]*//'`
135 case "$HPUXVER" in 135 case "$HPUXVER" in
136 1[0-9].*) # HPUX 10 and 11 targets are unified 136 1[0-9].*) # HPUX 10 and 11 targets are unified
137 echo "${MACHINE}-hp-hpux10"; exit 0 137 echo "${MACHINE}-hp-hpux1x"; exit 0
138 ;; 138 ;;
139 *) 139 *)
140 echo "${MACHINE}-hp-hpux"; exit 0 140 echo "${MACHINE}-hp-hpux"; exit 0
@@ -410,9 +410,10 @@ if [ "$SYSTEM" = "HP-UX" ];then
410 GCC_BITS="32" 410 GCC_BITS="32"
411 if [ $GCCVER -ge 30 ]; then 411 if [ $GCCVER -ge 30 ]; then
412 # PA64 support only came in with gcc 3.0.x. 412 # PA64 support only came in with gcc 3.0.x.
413 # We look for the preprocessor symbol __LP64__ indicating 413 # We check if the preprocessor symbol __LP64__ is defined...
414 # 64bit bit long and pointer. sizeof(int) == 32 on HPUX64. 414 if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
415 if gcc -v -E -x c /dev/null 2>&1 | grep __LP64__ > /dev/null; then 415 : # __LP64__ has slipped through, it therefore is not defined
416 else
416 GCC_BITS="64" 417 GCC_BITS="64"
417 fi 418 fi
418 fi 419 fi
@@ -685,7 +686,7 @@ EOF
685 if [ $CC = "gcc" ]; 686 if [ $CC = "gcc" ];
686 then 687 then
687 if [ $GCC_BITS = "64" ]; then 688 if [ $GCC_BITS = "64" ]; then
688 OUT="hpux64-parisc-gcc" 689 OUT="hpux64-parisc2-gcc"
689 else 690 else
690 OUT="hpux-parisc-gcc" 691 OUT="hpux-parisc-gcc"
691 fi 692 fi
@@ -700,7 +701,7 @@ EOF
700 if [ $CPU_VERSION -ge 768 ]; then # IA-64 CPU 701 if [ $CPU_VERSION -ge 768 ]; then # IA-64 CPU
701 echo "WARNING! 64-bit ABI is the default configured ABI on HP-UXi." 702 echo "WARNING! 64-bit ABI is the default configured ABI on HP-UXi."
702 echo " If you wish to build 32-bit library, the you have to" 703 echo " If you wish to build 32-bit library, the you have to"
703 echo " invoke './Configure hpux-ia32-cc' *manually*." 704 echo " invoke './Configure hpux-ia64-cc' *manually*."
704 if [ "$TEST" = "false" ]; then 705 if [ "$TEST" = "false" ]; then
705 echo " You have about 5 seconds to press Ctrl-C to abort." 706 echo " You have about 5 seconds to press Ctrl-C to abort."
706 (stty -icanon min 0 time 50; read waste) < /dev/tty 707 (stty -icanon min 0 time 50; read waste) < /dev/tty