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

Merge "Consistent use of USE_MINGW"

Browse Source
This commit is contained in:
Ying Wang
2014-08-08 03:14:23 +00:00
committed by Gerrit Code Review
parent 76c942c164 594a10ae77
commit 6dbbb15997
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/binary.mk
View File

@@ -116,7 +116,7 @@ my_generated_sources := $(LOCAL_GENERATED_SOURCES)
# MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because # MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because
# all code is position independent, and then those warnings get promoted to # all code is position independent, and then those warnings get promoted to
# errors. # errors.
ifeq ($(strip $(USE_MINGW)),) ifndef USE_MINGW
ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES) ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
my_cflags += -fpie my_cflags += -fpie
else else

2
core/combo/HOST_windows-x86.mk
View File

@@ -24,7 +24,7 @@ TOOLS_EXE_SUFFIX := .exe
# Settings to use MinGW has a cross-compiler under Linux # Settings to use MinGW has a cross-compiler under Linux
ifneq ($(findstring Linux,$(UNAME)),) ifneq ($(findstring Linux,$(UNAME)),)
ifneq ($(strip $(USE_MINGW)),) ifdef USE_MINGW
HOST_ACP_UNAVAILABLE := true HOST_ACP_UNAVAILABLE := true
TOOLS_EXE_SUFFIX := TOOLS_EXE_SUFFIX :=
$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -DUSE_MINGW $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -DUSE_MINGW

2
core/combo/HOST_windows-x86_64.mk
View File

@@ -24,7 +24,7 @@ TOOLS_EXE_SUFFIX := .exe
# Settings to use MinGW has a cross-compiler under Linux # Settings to use MinGW has a cross-compiler under Linux
ifneq ($(findstring Linux,$(UNAME)),) ifneq ($(findstring Linux,$(UNAME)),)
ifneq ($(strip $(USE_MINGW)),) ifdef USE_MINGW
HOST_ACP_UNAVAILABLE := true HOST_ACP_UNAVAILABLE := true
TOOLS_EXE_SUFFIX := TOOLS_EXE_SUFFIX :=
HOST_GLOBAL_CFLAGS += -DUSE_MINGW HOST_GLOBAL_CFLAGS += -DUSE_MINGW

2
core/envsetup.mk
View File

@@ -58,7 +58,7 @@ BUILD_OS := $(HOST_OS)
# Under Linux, if USE_MINGW is set, we change HOST_OS to Windows to build the # Under Linux, if USE_MINGW is set, we change HOST_OS to Windows to build the
# Windows SDK. Only a subset of tools and SDK will manage to build properly. # Windows SDK. Only a subset of tools and SDK will manage to build properly.
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
ifneq ($(USE_MINGW),) ifdef USE_MINGW
HOST_OS := windows HOST_OS := windows
endif endif
endif endif

2
tools/zipalign/Android.mk
View File

@@ -24,7 +24,7 @@ ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -lrt LOCAL_LDLIBS += -lrt
endif endif
ifneq ($(strip $(USE_MINGW)),) ifdef USE_MINGW
LOCAL_STATIC_LIBRARIES += libz LOCAL_STATIC_LIBRARIES += libz
else else
LOCAL_LDLIBS += -lz LOCAL_LDLIBS += -lz