Fossil SCM
Keep the verbose output as it's helpful for debugging, and because Fossil build output is also very detailed.
Commit
c62f663e195948d63580698e1582407b6c1a408b572856d8a288db37b07c62d3
Parent
7dcf497daaea535…
1 file changed
+4
-1
+4
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -804,10 +804,13 @@ | ||
| 804 | 804 | @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd |
| 805 | 805 | |
| 806 | 806 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 807 | 807 | openssl: |
| 808 | 808 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 809 | +!if $(FOSSIL_ENABLE_WINXP)!=0 | |
| 810 | + @echo Passing XPCFLAGS = [ $(XPCFLAGS) ] to the OpenSSL configuration... | |
| 811 | +!endif | |
| 809 | 812 | !ifdef PERLDIR |
| 810 | 813 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 811 | 814 | !else |
| 812 | 815 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 813 | 816 | !endif |
| @@ -827,11 +830,11 @@ | ||
| 827 | 830 | # the OpenSSL makefile by hand. |
| 828 | 831 | # |
| 829 | 832 | # Also note that this step changes the subsystem for the OpenSSL DLLs from |
| 830 | 833 | # WINDOWS to CONSOLE, but which has no effect on DLLs. |
| 831 | 834 | # |
| 832 | - @echo Post-processing the OpenSSL DLLs... | |
| 835 | + @echo Applying XPLDFLAGS = [ $(XPLDFLAGS) ] to the OpenSSL DLLs... | |
| 833 | 836 | @for /F "usebackq delims=" %F in (`dir /A:-D/B "$(SSLDIR)\*.dll" 2^>nul`) \ |
| 834 | 837 | do @( \ |
| 835 | 838 | echo %F & \ |
| 836 | 839 | link /EDIT /NOLOGO $(XPLDFLAGS) "$(SSLDIR)\%F" || exit 1 \ |
| 837 | 840 | ) |
| 838 | 841 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -804,10 +804,13 @@ | |
| 804 | @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd |
| 805 | |
| 806 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 807 | openssl: |
| 808 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 809 | !ifdef PERLDIR |
| 810 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 811 | !else |
| 812 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 813 | !endif |
| @@ -827,11 +830,11 @@ | |
| 827 | # the OpenSSL makefile by hand. |
| 828 | # |
| 829 | # Also note that this step changes the subsystem for the OpenSSL DLLs from |
| 830 | # WINDOWS to CONSOLE, but which has no effect on DLLs. |
| 831 | # |
| 832 | @echo Post-processing the OpenSSL DLLs... |
| 833 | @for /F "usebackq delims=" %F in (`dir /A:-D/B "$(SSLDIR)\*.dll" 2^>nul`) \ |
| 834 | do @( \ |
| 835 | echo %F & \ |
| 836 | link /EDIT /NOLOGO $(XPLDFLAGS) "$(SSLDIR)\%F" || exit 1 \ |
| 837 | ) |
| 838 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -804,10 +804,13 @@ | |
| 804 | @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd |
| 805 | |
| 806 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 807 | openssl: |
| 808 | @echo Building OpenSSL from "$(SSLDIR)"... |
| 809 | !if $(FOSSIL_ENABLE_WINXP)!=0 |
| 810 | @echo Passing XPCFLAGS = [ $(XPCFLAGS) ] to the OpenSSL configuration... |
| 811 | !endif |
| 812 | !ifdef PERLDIR |
| 813 | @pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd |
| 814 | !else |
| 815 | @pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd |
| 816 | !endif |
| @@ -827,11 +830,11 @@ | |
| 830 | # the OpenSSL makefile by hand. |
| 831 | # |
| 832 | # Also note that this step changes the subsystem for the OpenSSL DLLs from |
| 833 | # WINDOWS to CONSOLE, but which has no effect on DLLs. |
| 834 | # |
| 835 | @echo Applying XPLDFLAGS = [ $(XPLDFLAGS) ] to the OpenSSL DLLs... |
| 836 | @for /F "usebackq delims=" %F in (`dir /A:-D/B "$(SSLDIR)\*.dll" 2^>nul`) \ |
| 837 | do @( \ |
| 838 | echo %F & \ |
| 839 | link /EDIT /NOLOGO $(XPLDFLAGS) "$(SSLDIR)\%F" || exit 1 \ |
| 840 | ) |
| 841 |