Merge change 7059

* changes:
  Apparently the build server uses a different compiler, one that doesn't understand '-fdiagnostics-show-option'
This commit is contained in:
Android (Google) Code Review 2009-07-13 21:00:57 -07:00
commit 28e0fb4f03

View file

@ -75,7 +75,7 @@ SHOW_COMMANDS:= $(filter showcommands,$(MAKECMDGOALS))
# ###############################################################
# These can be changed to modify both host and device modules.
COMMON_GLOBAL_CFLAGS:= -DANDROID -fmessage-length=0 -W -Wall -Wno-unused -fdiagnostics-show-option -Winit-self -Wpointer-arith
COMMON_GLOBAL_CFLAGS:= -DANDROID -fmessage-length=0 -W -Wall -Wno-unused -Winit-self -Wpointer-arith
COMMON_RELEASE_CFLAGS:= -DNDEBUG -UDEBUG
COMMON_GLOBAL_CPPFLAGS:= $(COMMON_GLOBAL_CFLAGS) -Wsign-promo -Wctor-dtor-privacy