[krbdev.mit.edu #8662] git commit

Greg Hudson via RT rt-comment at KRBDEV-PROD-APP-1.mit.edu
Wed Jun 20 12:20:19 EDT 2018


Clean up Windows build CPU detection

In the main build, set a variable BITS based on the detected CPU type,
and use it in library name expansions rather than repeatedly checking
for the same three 64-bit architectures.  Also remove an unused
variable WLIB, formerly used to name the winsock library.

In the installer build, detect the CPU type in the makefile and pass
it to candle with the -arch option.  This sets $(sys.BUILDARCH) in wix
scripts and also sets the default value of Win64 in components so we
don't have to set it for each one.

Update the build instructions and appveyor.yml to reflect that the
builder no longer needs to set CPU.

https://github.com/krb5/krb5/commit/3a30dec3bbb7f264b7ce74e363c9b23edfd4e491
Author: Greg Hudson <ghudson at mit.edu>
Commit: 3a30dec3bbb7f264b7ce74e363c9b23edfd4e491
Branch: master
 appveyor.yml                                   |    2 -
 src/config/win-pre.in                          |   38 ++---
 src/lib/Makefile.in                            |    6 +-
 src/windows/README                             |   32 ++---
 src/windows/installer/wix/Makefile             |   14 ++-
 src/windows/installer/wix/config.wxi           |   12 --
 src/windows/installer/wix/features.wxi         |    8 +-
 src/windows/installer/wix/files.wxi            |  172 +++++++++++-------------
 src/windows/installer/wix/kfw.wxs              |    3 +-
 src/windows/installer/wix/lang/config_1033.wxi |    4 +-
 src/windows/installer/wix/platform.wxi         |    4 +-
 src/windows/installer/wix/runtime.wxi          |    2 +-
 src/windows/leash/Makefile.in                  |    2 +-
 src/windows/leashdll/Makefile.in               |    8 +-
 14 files changed, 134 insertions(+), 173 deletions(-)



More information about the krb5-bugs mailing list