Author: jfrederic.clere(a)jboss.com Date: 2009-09-24 07:56:30 -0400 (Thu, 24 Sep 2009) New Revision: 2569 Modified: trunk/build/unix/build.sh Log: Use our own tools.ini file for openssl. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2009-09-24 08:41:08 UTC (rev 2568) +++ trunk/build/unix/build.sh 2009-09-24 11:56:30 UTC (rev 2569) @@ -648,19 +648,11 @@ ;; windows-i64) ./Configure ${ssl_target} VC-WIN64I - find . -name "*.ojb" -exec rm -f {} \; ms/do_win64i.bat - # it builds ms/uptable.obj but in tools.ini we have !CMDSWITCHES +A so it would be - # build again and will failed due to ASM instead AS and due to /c of the predefined rules - # (See http://msdn.microsoft.com/en-us/library/cx06ysxh.aspx) - # In fact we don't want the !CMDSWITCHES +A - # fix the ml to ias... sed "s:=ml :=ias :" ms/nt.mak > $$.mak mv $$.mak ms/nt.mak sed "s:=ml :=ias :" ms/ntdll.mak > $$.mak mv $$.mak ms/ntdll.mak - sed "/^ASM=/a \!CMDSWITCHES -A" ms/ntdll.mak > $$.mak - mv $$.mak ms/ntdll.mak ;; *) ./config ${ssl_target} -fPIC ${ssl_common_flags} ${ssl_build_flags} || exit 1 @@ -668,11 +660,21 @@ esac echo "Building OpenSSL ${ssl_version} for ${BUILD_TAG} ..." if $BUILD_WIN ; then + # it builds ms/uptable.obj but in tools.ini we have !CMDSWITCHES +A so it would be + # build again and will failed due to ASM instead AS and due to the /c of the predefined rules + # (See http://msdn.microsoft.com/en-us/library/cx06ysxh.aspx) + # In fact we don't want the !CMDSWITCHES +A + find . -name "*.ojb" -exec rm -f {} \; + sed "s:!CMDSWITCHES +A:#!CMDSWITCHES +A:" ../../../../../windows/tools.ini > tools.ini + initval=`set | grep "^INIT=" | awk -F = ' { print $2 } '` + WHERE=`pwd` + INIT=`cygpath -w ${WHERE}` if $ssl_static ; then nmake -f ms/nt.mak install || exit 1 else nmake -f ms/ntdll.mak install || exit 1 fi + INIT=${initval} else make depend || exit 1 make || exit 1