StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn off Windows builds during BUILD_HOST_static

Browse Source 
We can only create static host binaries for Linux, so if static host
binaries are requested, turn off Windows cross-builds.

Test: m zipalign BUILD_HOST_static=1
Change-Id: Ib37508d4b502cd56dad535cb6eab648f625486c6
This commit is contained in:
Dan Willemsen
2017-11-06 11:03:28 -08:00
parent 887c645e02
commit 2a6e3b00b0
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/envsetup.mk
View File

@@ -124,11 +124,13 @@ BUILD_OS := $(HOST_OS)
HOST_CROSS_OS := HOST_CROSS_OS :=
# We can cross-build Windows binaries on Linux # We can cross-build Windows binaries on Linux
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
ifeq ($(BUILD_HOST_static),)
HOST_CROSS_OS := windows HOST_CROSS_OS := windows
HOST_CROSS_ARCH := x86 HOST_CROSS_ARCH := x86
HOST_CROSS_2ND_ARCH := x86_64 HOST_CROSS_2ND_ARCH := x86_64
2ND_HOST_CROSS_IS_64_BIT := true 2ND_HOST_CROSS_IS_64_BIT := true
endif endif
endif
ifeq ($(HOST_OS),) ifeq ($(HOST_OS),)
$(error Unable to determine HOST_OS from uname -sm: $(UNAME)!) $(error Unable to determine HOST_OS from uname -sm: $(UNAME)!)