]> git.ipfire.org Git - thirdparty/krb5.git/commit
Clean up Windows build CPU detection 788/head
authorGreg Hudson <ghudson@mit.edu>
Sat, 19 May 2018 02:04:25 +0000 (22:04 -0400)
committerGreg Hudson <ghudson@mit.edu>
Wed, 20 Jun 2018 15:35:52 +0000 (11:35 -0400)
commit3a30dec3bbb7f264b7ce74e363c9b23edfd4e491
tree827d7e92964b5a0cbf47c4d2bff6341ba0184580
parent909c655a9fa38102cfc9864757a33173388146ba
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.

ticket: 8662
14 files changed:
appveyor.yml
src/config/win-pre.in
src/lib/Makefile.in
src/windows/README
src/windows/installer/wix/Makefile
src/windows/installer/wix/config.wxi
src/windows/installer/wix/features.wxi
src/windows/installer/wix/files.wxi
src/windows/installer/wix/kfw.wxs
src/windows/installer/wix/lang/config_1033.wxi
src/windows/installer/wix/platform.wxi
src/windows/installer/wix/runtime.wxi
src/windows/leash/Makefile.in
src/windows/leashdll/Makefile.in