diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-10 16:59:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-10 16:59:07 -0700 |
| commit | 21060b30993b975084ea7a7c35a6df23cf0e5ea7 (patch) | |
| tree | 56e5a97590ee0ed6a9e1c8365db221d083bffdf9 /core/combo | |
| parent | bc39fd5cab47388797ee7638920766e91fe0b100 (diff) | |
| parent | 775d15e001d48d72a1b76982b1b5faa1eb37158f (diff) | |
| download | build-21060b30993b975084ea7a7c35a6df23cf0e5ea7.zip build-21060b30993b975084ea7a7c35a6df23cf0e5ea7.tar.gz build-21060b30993b975084ea7a7c35a6df23cf0e5ea7.tar.bz2 | |
am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
* commit '775d15e001d48d72a1b76982b1b5faa1eb37158f':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 2 | ||||
| -rw-r--r-- | core/combo/HOST_linux-x86.mk | 2 | ||||
| -rw-r--r-- | core/combo/HOST_windows-x86.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index a0aaafa..037dee6 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -36,7 +36,7 @@ endif # BUILD_HOST_static # Workaround differences in inttypes.h between host and target. # See bug 12708004. -HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS +HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS build_mac_version := $(shell sw_vers -productVersion) diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index 3d03ed6..944a31d 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -60,6 +60,6 @@ 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_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS HOST_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined diff --git a/core/combo/HOST_windows-x86.mk b/core/combo/HOST_windows-x86.mk index 2f27aa7..1709711 100644 --- a/core/combo/HOST_windows-x86.mk +++ b/core/combo/HOST_windows-x86.mk @@ -42,7 +42,7 @@ endif # Linux # Workaround differences in inttypes.h between host and target. # See bug 12708004. -HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS +HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS HOST_CC := $(TOOLS_PREFIX)gcc$(TOOLS_EXE_SUFFIX) HOST_CXX := $(TOOLS_PREFIX)g++$(TOOLS_EXE_SUFFIX) |