summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-03-10 23:27:01 +0000
committerIan Rogers <irogers@google.com>2014-03-10 23:27:01 +0000
commitc61a9425cd6503783030a20214d92abf7804a613 (patch)
tree85030b47d2fc8ebd9cf8e23eb1b681b8fd1f0583
parent668427c941bd88cacdf24d0562e6b68eb93038a1 (diff)
downloadbuild-c61a9425cd6503783030a20214d92abf7804a613.zip
build-c61a9425cd6503783030a20214d92abf7804a613.tar.gz
build-c61a9425cd6503783030a20214d92abf7804a613.tar.bz2
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
This reverts commit 668427c941bd88cacdf24d0562e6b68eb93038a1. Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802
-rw-r--r--core/combo/HOST_darwin-x86.mk2
-rw-r--r--core/combo/HOST_linux-x86.mk2
-rw-r--r--core/combo/HOST_windows-x86.mk2
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)