krb5 commit: Set MIDL target environment on Windows
[email protected] Fri, 10 Jul 2026 02:40:27 -0400 (EDT)
| Newsgroups | gmane.comp.encryption.kerberos.cvs |
|---|---|
| Message-ID | <[email protected]> |
https://github.com/krb5/krb5/commit/d22c092bba2557a436a79a016a9a826d6bacc125 commit d22c092bba2557a436a79a016a9a826d6bacc125 Author: Sargun Vohra <[email protected]> Date: Fri Jun 19 21:43:58 2026 -0700 Set MIDL target environment on Windows In the Windows build, ensure that midl generates files for the target CPU. src/ccapi/lib/win/Makefile.in | 8 ++++---- src/ccapi/server/win/Makefile.in | 8 ++++---- src/config/win-pre.in | 7 +++++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in index 0ad9590db..abec1cb19 100644 --- a/src/ccapi/lib/win/Makefile.in +++ b/src/ccapi/lib/win/Makefile.in @@ -67,12 +67,12 @@ LFLAGS = /nologo $(LOPTS) all: Makefile copysrc midl $(OUTPRE)$(CCLIB).dll finish ccs_request.h ccs_request_c.c ccs_request_s.c : ccs_request.idl ccs_request.acf - midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ - ccs_request.idl + midl $(MIDL_OPTIMIZATION) $(MIDLI) $(MIDL_ENV) -oldnames -cpp_cmd $(CC) \ + -cpp_opt "-E" ccs_request.idl ccs_reply.h ccs_reply_c.c ccs_reply_s.c : ccs_reply.idl ccs_reply.acf - midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ - ccs_reply.idl + midl $(MIDL_OPTIMIZATION) $(MIDLI) $(MIDL_ENV) -oldnames -cpp_cmd $(CC) \ + -cpp_opt "-E" ccs_reply.idl copysrc : echo "Copying all sources needed to build $(CCLIB).dll to $(SRCTMP)" diff --git a/src/ccapi/server/win/Makefile.in b/src/ccapi/server/win/Makefile.in index 1c925a287..dcbbfa83b 100644 --- a/src/ccapi/server/win/Makefile.in +++ b/src/ccapi/server/win/Makefile.in @@ -72,12 +72,12 @@ LFLAGS = /nologo $(LOPTS) all: Makefile copysrc midl $(OUTPRE)ccapiserver.exe finish ccs_request.h ccs_request_c.c ccs_request_s.c : ccs_request.idl ccs_request.acf - midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ - ccs_request.idl + midl $(MIDL_OPTIMIZATION) $(MIDLI) $(MIDL_ENV) -oldnames -cpp_cmd $(CC) \ + -cpp_opt "-E" ccs_request.idl ccs_reply.h ccs_reply_c.c ccs_reply_s.c : ccs_reply.idl ccs_reply.acf - midl $(MIDL_OPTIMIZATION) $(MIDLI) -oldnames -cpp_cmd $(CC) -cpp_opt "-E" \ - ccs_reply.idl + midl $(MIDL_OPTIMIZATION) $(MIDLI) $(MIDL_ENV) -oldnames -cpp_cmd $(CC) \ + -cpp_opt "-E" ccs_reply.idl copysrc : echo "Copying all sources needed to build ccapiserver.exe to $(SRCTMP)" diff --git a/src/config/win-pre.in b/src/config/win-pre.in index 0bcb280df..5361b14dc 100644 --- a/src/config/win-pre.in +++ b/src/config/win-pre.in @@ -126,6 +126,13 @@ CCOPTS=-nologo /EHsc /W3 /we4020 /we4024 /we4047 $(PDB_OPTS) $(DLL_FILE_DEF) LOPTS=-nologo -incremental:no -manifest CCLINKOPTION= +MIDL_ENV= +!if "$(CPU)" == "AMD64" +MIDL_ENV=/env x64 +!elseif "$(CPU)" == "ARM64" +MIDL_ENV=/env arm64 +!endif + DEBUGOPT=/guard:cf /Zi #if the compiler is vstudio 8, generate manifest