am 805cb8fa: Merge "Fix the host inttypes.h problem globally."

* commit '805cb8fa40f71b3e1f6566bf10ca169d4a2ff86f':
  Fix the host inttypes.h problem globally.
This commit is contained in:
Ian Rogers 2014-01-31 10:26:52 +00:00 committed by Android Git Automerger
commit eb02fa0a6b
2 changed files with 8 additions and 0 deletions

View file

@ -34,6 +34,10 @@ ifneq ($(strip $(BUILD_HOST_static)),)
HOST_GLOBAL_LDFLAGS += -static HOST_GLOBAL_LDFLAGS += -static
endif # BUILD_HOST_static endif # BUILD_HOST_static
# Workaround differences in inttypes.h between host and target.
# See bug 12708004.
HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS
build_mac_version := $(shell sw_vers -productVersion) build_mac_version := $(shell sw_vers -productVersion)
mac_sdk_versions_supported := 10.6 10.7 10.8 mac_sdk_versions_supported := 10.6 10.7 10.8

View file

@ -58,4 +58,8 @@ HOST_GLOBAL_CFLAGS += -fPIC \
# Disable new longjmp in glibc 2.11 and later. See bug 2967937. # Disable new longjmp in glibc 2.11 and later. See bug 2967937.
HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
# Workaround differences in inttypes.h between host and target.
# See bug 12708004.
HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS
HOST_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined HOST_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined