diff options
| author | Ying Wang <wangying@google.com> | 2014-08-08 03:26:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-08 03:26:07 +0000 |
| commit | 5a5d443f156fb61a365773d617e5d2747eeea26d (patch) | |
| tree | 2761f05599d3cb22ac3e6edd1978fa3bf556cfb2 /core | |
| parent | 493c61af6a6d877b4e0ab6b6a385b665b3bc81a7 (diff) | |
| parent | 8ac188ff0e739ea75ea02166c54428245200f088 (diff) | |
| download | build-5a5d443f156fb61a365773d617e5d2747eeea26d.zip build-5a5d443f156fb61a365773d617e5d2747eeea26d.tar.gz build-5a5d443f156fb61a365773d617e5d2747eeea26d.tar.bz2 | |
am 8ac188ff: am 6dbbb159: Merge "Consistent use of USE_MINGW"
* commit '8ac188ff0e739ea75ea02166c54428245200f088':
Consistent use of USE_MINGW
Diffstat (limited to 'core')
| -rw-r--r-- | core/binary.mk | 2 | ||||
| -rw-r--r-- | core/combo/HOST_windows-x86.mk | 2 | ||||
| -rw-r--r-- | core/combo/HOST_windows-x86_64.mk | 2 | ||||
| -rw-r--r-- | core/envsetup.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/core/binary.mk b/core/binary.mk index 57c7ea7..ec06a2f 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -116,7 +116,7 @@ my_generated_sources := $(LOCAL_GENERATED_SOURCES) # MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because # all code is position independent, and then those warnings get promoted to # errors. -ifeq ($(strip $(USE_MINGW)),) +ifndef USE_MINGW ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES) my_cflags += -fpie else diff --git a/core/combo/HOST_windows-x86.mk b/core/combo/HOST_windows-x86.mk index 4d871d8..766c14a 100644 --- a/core/combo/HOST_windows-x86.mk +++ b/core/combo/HOST_windows-x86.mk @@ -24,7 +24,7 @@ TOOLS_EXE_SUFFIX := .exe # Settings to use MinGW has a cross-compiler under Linux ifneq ($(findstring Linux,$(UNAME)),) -ifneq ($(strip $(USE_MINGW)),) +ifdef USE_MINGW HOST_ACP_UNAVAILABLE := true TOOLS_EXE_SUFFIX := $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -DUSE_MINGW diff --git a/core/combo/HOST_windows-x86_64.mk b/core/combo/HOST_windows-x86_64.mk index c77d82c..bd392ea 100644 --- a/core/combo/HOST_windows-x86_64.mk +++ b/core/combo/HOST_windows-x86_64.mk @@ -24,7 +24,7 @@ TOOLS_EXE_SUFFIX := .exe # Settings to use MinGW has a cross-compiler under Linux ifneq ($(findstring Linux,$(UNAME)),) -ifneq ($(strip $(USE_MINGW)),) +ifdef USE_MINGW HOST_ACP_UNAVAILABLE := true TOOLS_EXE_SUFFIX := HOST_GLOBAL_CFLAGS += -DUSE_MINGW diff --git a/core/envsetup.mk b/core/envsetup.mk index 96044b3..fe995e4 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -58,7 +58,7 @@ BUILD_OS := $(HOST_OS) # 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. ifeq ($(HOST_OS),linux) -ifneq ($(USE_MINGW),) +ifdef USE_MINGW HOST_OS := windows endif endif |