summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-08-07 18:29:11 -0700
committerDan Albert <danalbert@google.com>2014-08-07 18:29:11 -0700
commit95994def18dbf2672040105fb61f17b57e8b7fe4 (patch)
tree9338d96cc7d5de86036f6e1b0d36563d249e3bcc
parentcbc742a1b7202dfac78795469d04c02cd323e064 (diff)
downloadbuild-95994def18dbf2672040105fb61f17b57e8b7fe4.zip
build-95994def18dbf2672040105fb61f17b57e8b7fe4.tar.gz
build-95994def18dbf2672040105fb61f17b57e8b7fe4.tar.bz2
Fix Windows SDK build.
Change-Id: Ia2a318957aa525f0e72b556a693a20f513146b64
-rw-r--r--core/binary.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/binary.mk b/core/binary.mk
index 6834797..bda9f2e 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -113,11 +113,16 @@ my_cxx := $(LOCAL_CXX)
my_c_includes := $(LOCAL_C_INCLUDES)
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)),)
ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
my_cflags += -fpie
else
my_cflags += -fPIC
endif
+endif
my_src_files += $(LOCAL_SRC_FILES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SRC_FILES_$(my_32_64_bit_suffix))
my_shared_libraries += $(LOCAL_SHARED_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SHARED_LIBRARIES_$(my_32_64_bit_suffix))