diff options
Diffstat (limited to '')
| -rw-r--r-- | auto/lib/md5/make | 47 | ||||
| -rw-r--r-- | auto/lib/md5/makefile.msvc | 2 |
2 files changed, 32 insertions, 17 deletions
diff --git a/auto/lib/md5/make b/auto/lib/md5/make index c844c2938..0f2bb3ca1 100644 --- a/auto/lib/md5/make +++ b/auto/lib/md5/make @@ -25,6 +25,9 @@ case $PLATFORM in esac +done=NO + + case $PLATFORM in win32) @@ -32,39 +35,51 @@ case $PLATFORM in cp auto/lib/md5/$makefile $MD5 echo " cd $MD5" >> $MAKEFILE echo $ngx_n " \$(MAKE) -f $makefile" $ngx_c >> $MAKEFILE - echo " CPU_OPT=$CPU_OPT MD5_ASM=$MD5_ASM" >> $MAKEFILE + echo " CPU_OPT=$CPU_OPT LIBC=$LIBC MD5_ASM=$MD5_ASM" >> $MAKEFILE echo " cd ..\\..\\.." >> $MAKEFILE + + done=YES ;; SunOS:*:i86pc) if [ $MD5_ASM = YES ]; then - echo " cd $MD5 \\" >> $MAKEFILE - echo " && \$(MAKE) $MD5_OPT MAKE=\$(MAKE) \\" >> $MAKEFILE - echo " x86-solaris" >> $MAKEFILE - else + + MD5_OPT="CFLAGS=\"$MD5_OPT -DSOL -DMD5_ASM -DL_ENDIAN\"" + echo " cd $MD5 \\" >> $MAKEFILE echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE - echo " MD5_ASM_OBJ= CC=$CC all" >> $MAKEFILE + echo " MD5_ASM_OBJ=asm/mx86-elf.o \\" >> $MAKEFILE + echo " CC=$CC CPP=\"$CPP\" libmd5.a" >> $MAKEFILE + + done=YES fi ;; + # FreeBSD: i386 + # Linux: i686 + *:i386 | *:i686) if [ $MD5_ASM = YES ]; then - echo " cd $MD5 \\" >> $MAKEFILE - echo " && \$(MAKE) $MD5_OPT MAKE=\$(MAKE) \\" >> $MAKEFILE - echo " x86-elf" >> $MAKEFILE - else + + MD5_OPT="CFLAGS=\"$MD5_OPT -DELF -DMD5_ASM -DL_ENDIAN\"" + echo " cd $MD5 \\" >> $MAKEFILE echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE - echo " MD5_ASM_OBJ= CC=$CC all" >> $MAKEFILE - fi - ;; + echo " MD5_ASM_OBJ=asm/mx86-elf.o \\" >> $MAKEFILE + echo " CC=$CC CPP=\"$CPP\" libmd5.a" >> $MAKEFILE - *) - echo " cd $MD5 \\" >> $MAKEFILE - echo " && \$(MAKE) $MD5_OPT MD5_ASM_OBJ= CC=$CC all" >> $MAKEFILE + done=YES + fi ;; esac + +if [ $done = NO ]; then + echo " cd $MD5 \\" >> $MAKEFILE + echo " && \$(MAKE) CFLAGS=\"$MD5_OPT\" \\" >> $MAKEFILE + echo " MD5_ASM_OBJ= CC=$CC libmd5.a" >> $MAKEFILE +fi + + echo >> $MAKEFILE diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc index 65ca4ab8d..7ba190d86 100644 --- a/auto/lib/md5/makefile.msvc +++ b/auto/lib/md5/makefile.msvc @@ -1,5 +1,5 @@ -CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(CPU_OPT) -D L_ENDIAN +CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN !if "$(MD5_ASM)" == "YES" |