diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-10 16:33:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-10 16:33:44 -0700 |
| commit | bc39fd5cab47388797ee7638920766e91fe0b100 (patch) | |
| tree | 85030b47d2fc8ebd9cf8e23eb1b681b8fd1f0583 /core | |
| parent | a520bfbeb65b307da42abb079911311096fef20c (diff) | |
| parent | f1e697be5e433818071a817af0b673cba8e87795 (diff) | |
| download | build-bc39fd5cab47388797ee7638920766e91fe0b100.zip build-bc39fd5cab47388797ee7638920766e91fe0b100.tar.gz build-bc39fd5cab47388797ee7638920766e91fe0b100.tar.bz2 | |
am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
* commit 'f1e697be5e433818071a817af0b673cba8e87795':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Diffstat (limited to 'core')
| -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 be2e98e..a0aaafa 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 -D__STDC_LIMIT_MACROS +HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_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 7276bb4..3d03ed6 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 -D__STDC_LIMIT_MACROS +HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_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 84a55ac..2f27aa7 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 -D__STDC_LIMIT_MACROS +HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS HOST_CC := $(TOOLS_PREFIX)gcc$(TOOLS_EXE_SUFFIX) HOST_CXX := $(TOOLS_PREFIX)g++$(TOOLS_EXE_SUFFIX) |