summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--auto/lib/md5/makefile.msvc1
-rw-r--r--auto/make2
-rw-r--r--auto/os/solaris3
3 files changed, 5 insertions, 1 deletions
diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc
index 60a662407..a45fc52eb 100644
--- a/auto/lib/md5/makefile.msvc
+++ b/auto/lib/md5/makefile.msvc
@@ -2,4 +2,5 @@
all:
cl -nologo -c -MT -O2 -Ob1 -Oi -Gs -D MD5_ASM -D L_ENDIAN \
md5_dgst.c md5_one.c
+
link -lib -out:md5.lib md5_dgst.obj md5_one.obj asm/m-win32.obj
diff --git a/auto/make b/auto/make
index e4e1a2661..5a019db3d 100644
--- a/auto/make
+++ b/auto/make
@@ -158,7 +158,7 @@ do
fi
if [ $MAKE_SL = YES ]; then
- echo $ngx_n " $obj," $ngx_c >> $MAKEFILE
+ echo $ngx_n " $obj" $ngx_c >> $MAKEFILE
else
echo " $obj \\" >> $MAKEFILE
fi
diff --git a/auto/os/solaris b/auto/os/solaris
index dd6c85cab..818886bed 100644
--- a/auto/os/solaris
+++ b/auto/os/solaris
@@ -6,6 +6,9 @@ EVENT_MODULES="$EVENT_MODULES"
CORE_LIBS="$CORE_LIBS -lsocket -lnsl"
+# the Solaris's make support
+MAKE_SL=YES
+
CC_TEST_FLAGS="-D_FILE_OFFSET_BITS=64"