diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:38:30 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:38:30 +0000 |
| commit | b3547836db69e4898021551f1815d38925ec9f49 (patch) | |
| tree | 5674452933be21b00d29ace830491df23bad7259 /openssl | |
| parent | 13a3e75bdb792aae981b2e206fb24497fb3d6299 (diff) | |
INTEGRATION: CWS nowrapcmd1 (1.21.2); FILE MERGED
2007/12/04 17:57:00 vq 1.21.2.1: #i82202#, #i84084# Fix openssl build issue for nowrapcmd1 and 4NT builds.
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/makefile.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 8239320431f8..0c609b4e056d 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # -# last change: $Author: hjs $ $Date: 2007-11-27 16:10:59 $ +# last change: $Author: kz $ $Date: 2007-12-12 15:38:30 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -92,7 +92,12 @@ ADDITIONAL_FILES:= \ PATCH_FILE_NAME=openssl.patch .IF "$(MAKETARGETS)" == "" -# The env. var PERL is used by nmake, and nmake insists on '\'s +# The env. vars CC and PERL are used by nmake, and nmake insists on '\'s +# If WRAPCMD is set it is prepended before the compiler, don't touch that. +.IF "$(WRAPCMD)"=="" +CC!:=$(subst,/,\ $(normpath,1 $(CC))) +.EXPORT : CC +.ENDIF PERL_bak:=$(PERL) PERL!:=$(subst,/,\ $(normpath,1 $(PERL))) .EXPORT : PERL @@ -102,7 +107,7 @@ PERL!:=$(PERL_bak) #CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure CONFIGURE_ACTION=$(PERL) configure CONFIGURE_FLAGS=VC-WIN32 -BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL))) && set CC=test" && nmake -f ms/ntdll.mak +BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL)))" && nmake -f ms/ntdll.mak OUT2LIB = out32dll$/ssleay32.lib OUT2LIB += out32dll$/libeay32.lib |