diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-10 15:48:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-10 15:48:25 -0700 |
| commit | a520bfbeb65b307da42abb079911311096fef20c (patch) | |
| tree | 18edaad803406fe62daa7a262931367449064947 | |
| parent | 61cf1df7edbb9d52a6f151b011633b2859213c35 (diff) | |
| parent | 4783dc7ab509b7099d2de83f863a9799ce67659e (diff) | |
| download | build-a520bfbeb65b307da42abb079911311096fef20c.zip build-a520bfbeb65b307da42abb079911311096fef20c.tar.gz build-a520bfbeb65b307da42abb079911311096fef20c.tar.bz2 | |
am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
* commit '4783dc7ab509b7099d2de83f863a9799ce67659e':
Define __STDC_LIMIT_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..be2e98e 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_LIMIT_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..7276bb4 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_LIMIT_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..84a55ac 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_LIMIT_MACROS HOST_CC := $(TOOLS_PREFIX)gcc$(TOOLS_EXE_SUFFIX) HOST_CXX := $(TOOLS_PREFIX)g++$(TOOLS_EXE_SUFFIX) |