diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-10 23:55:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-10 23:55:32 +0000 |
| commit | 775d15e001d48d72a1b76982b1b5faa1eb37158f (patch) | |
| tree | 56e5a97590ee0ed6a9e1c8365db221d083bffdf9 | |
| parent | f1e697be5e433818071a817af0b673cba8e87795 (diff) | |
| parent | aa54033b469739b31e8c48eaa26f0dc7ef531738 (diff) | |
| download | build-775d15e001d48d72a1b76982b1b5faa1eb37158f.zip build-775d15e001d48d72a1b76982b1b5faa1eb37158f.tar.gz build-775d15e001d48d72a1b76982b1b5faa1eb37158f.tar.bz2 | |
Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
| -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) |