diff options
| author | Stephen Hines <srhines@google.com> | 2014-09-30 02:38:41 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-09-30 02:38:41 -0700 |
| commit | dc64c7b460c5ba3578d2531c33da1df6cc2e4c26 (patch) | |
| tree | 89c18bcf83860dc46f48d0fae431e39c02c437fd /core/combo/HOST_windows-x86.mk | |
| parent | b34b7aeb31d1dc60105c8e83c8188d25850616e2 (diff) | |
| download | build-dc64c7b460c5ba3578d2531c33da1df6cc2e4c26.zip build-dc64c7b460c5ba3578d2531c33da1df6cc2e4c26.tar.gz build-dc64c7b460c5ba3578d2531c33da1df6cc2e4c26.tar.bz2 | |
Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
Bug: 14416410
prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32
is the location for the checked-in hermetic mingw Windows compiler. This
removes our reliance on host mingw when building with "make win_sdk".
Change-Id: I1f9bbb85912d9855be32f9cab4bdfd12d6d3246c
Diffstat (limited to 'core/combo/HOST_windows-x86.mk')
| -rw-r--r-- | core/combo/HOST_windows-x86.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/combo/HOST_windows-x86.mk b/core/combo/HOST_windows-x86.mk index 4d871d8..fdb72a7 100644 --- a/core/combo/HOST_windows-x86.mk +++ b/core/combo/HOST_windows-x86.mk @@ -28,9 +28,14 @@ ifneq ($(strip $(USE_MINGW)),) HOST_ACP_UNAVAILABLE := true TOOLS_EXE_SUFFIX := $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -DUSE_MINGW -TOOLS_PREFIX := /usr/bin/i586-mingw32msvc- -$(combo_2nd_arch_prefix)HOST_C_INCLUDES += /usr/lib/gcc/i586-mingw32msvc/3.4.4/include -$(combo_2nd_arch_prefix)HOST_GLOBAL_LD_DIRS += -L/usr/i586-mingw32msvc/lib +$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -Wno-unused-parameter +$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += --sysroot=prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32 +$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -m32 +$(combo_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS += -m32 +TOOLS_PREFIX := prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/bin/x86_64-w64-mingw32- +$(combo_2nd_arch_prefix)HOST_C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/include +$(combo_2nd_arch_prefix)HOST_C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/lib/gcc/x86_64-w64-mingw32/4.8.3/include +$(combo_2nd_arch_prefix)HOST_GLOBAL_LD_DIRS += -Lprebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib32 endif # USE_MINGW endif # Linux |