OSDN Git Service

Add 64-bit windows cross-compiles
authorDan Willemsen <dwillemsen@google.com>
Sat, 6 Feb 2016 00:20:19 +0000 (16:20 -0800)
committerStephen Hines <srhines@google.com>
Sat, 27 Feb 2016 02:51:26 +0000 (18:51 -0800)
commit7e57b8ca57d6de66a16cf6b81b9fc5a74d465caa
tree02ef4441fc951c8a23c4cf107b943258dcbb1080
parent6dece90534af8b290ccc385fda2e4cf0f3a37454
Add 64-bit windows cross-compiles

This is mostly the same as the existing 2ND_HOST / HOST_CROSS support.

The interesting thing I did here was make x86 the 'first' architecture,
and x86_64 the second. This way LOCAL_MULTILIB := first defaults to
32-bit windows modules.

  windows-x86/bin   <- defaults to 32-bit executables
  windows-x86/lib   <- 32-bit libraries, like before
  windows-x86/lib64 <- 64-bit libraries
  windows-x86/obj   <- 32-bit intermediates
  windows-x86/obj64 <- 64-bit intermediates

Then modules are registered with the names:

  host_cross_liblog    <- 32-bit, like before
  host_cross_liblog_64 <- 64-bit

Bug: 26957718

(cherry picked from commit 9ecbf832593980facba06c9031b8539b9cfdfd26)

Change-Id: Iab2d36e20d7002568c3534e7781e9ac8ab21a4a9
13 files changed:
core/base_rules.mk
core/clang/HOST_CROSS_x86.mk [moved from core/clang/HOST_CROSS_windows.mk with 68% similarity]
core/clang/HOST_CROSS_x86_64.mk [new file with mode: 0644]
core/clang/config.mk
core/clear_vars.mk
core/combo/HOST_CROSS_windows-x86_64.mk [new file with mode: 0644]
core/config.mk
core/definitions.mk
core/dumpvar.mk
core/envsetup.mk
core/host_executable.mk
core/host_shared_library.mk
core/host_static_library.mk