From 8035fd27919d1f598b0d655a3bf30200220462d3 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 1 Oct 2004 15:53:53 +0000
Subject: nginx-0.1.0-2004-10-01-19:53:53 import

---
 auto/cc         | 6 ------
 auto/install    | 1 +
 auto/os/solaris | 8 ++++++++
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'auto')

diff --git a/auto/cc b/auto/cc
index b05df7669..eff642125 100644
--- a/auto/cc
+++ b/auto/cc
@@ -28,12 +28,6 @@ case $CC in
                  # optimize for Pentium 4, gcc 3.x
                  CPU_OPT="-march=pentium4"
              ;;
-
-             sparc64)
-                 # build 64-bit binary, sparcv9 only
-                 CPU_OPT="-m64"
-             ;;
-
          esac
 
          # STUB for batch builds
diff --git a/auto/install b/auto/install
index 31a191d83..b838b9b2c 100644
--- a/auto/install
+++ b/auto/install
@@ -7,6 +7,7 @@ install:
 	test -d $PREFIX || mkdir -p $PREFIX
 
 	test -d `dirname $SBIN_PATH` || mkdir -p `dirname $SBIN_PATH`
+	test ! -f $SBIN_PATH || mv $SBIN_PATH $SBIN_PATH.old
 	cp nginx $SBIN_PATH
 
 	test -d `dirname $CONF_PATH` || mkdir -p `dirname $CONF_PATH`
diff --git a/auto/os/solaris b/auto/os/solaris
index 6a4bd22b8..29497ff5f 100644
--- a/auto/os/solaris
+++ b/auto/os/solaris
@@ -32,6 +32,14 @@ case $PLATFORM in
 
     *:sun4u)
         CFLAGS="$CFLAGS -mcpu=v9"
+
+        if [ ".$CPU" = ".sparc64" ]; then
+            CFLAGS="$CFLAGS -m64"
+            CPU_OPT="-m64"
+            CORE_LINK="$CORE_LINK -m64"
+
+            CC_TEST_FLAGS="$CC_TEST_FLAGS -mcpu=v9 -m64"
+        fi
     ;;
 
     *)
-- 
cgit