From 20b2a6bd0d94b987bda9e32f4da1cb00a4bcd00f Mon Sep 17 00:00:00 2001
From: Joshua Haberman <joshua@reverberate.org>
Date: Sun, 27 Feb 2011 14:30:32 -0800
Subject: Default to -O3 if user doesn't specify opt.

However if the user *does* specify a -O flag,
don't override the optimization setting for
upb_def.o to -Os like we usually do.
---
 Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 68c56b6..2c85d57 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,13 @@ all: lib
 # User-specified CFLAGS.
 USER_CFLAGS=$(strip $(shell test -f perf-cppflags && cat perf-cppflags))
 
+# If the user doesn't specify an -O setting, we default to -O3, except
+# for upb_def which gets -Os.
+ifeq (, $(findstring -O, $(USER_CFLAGS)))
+  USER_CFLAGS += -O3
+  DEF_OPT = -Os
+endif
+
 # Basic compiler/flag setup.
 CC=gcc
 CXX=g++
@@ -146,11 +153,11 @@ $(LIBUPB_PIC): $(PICOBJ)
 # critical path but gets very large when -O3 is used.
 src/upb_def.o: src/upb_def.c
 	$(E) CC $<
-	$(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -O0 -c -o $@ $<
+	$(Q) $(CC) $(CFLAGS) $(CPPFLAGS) $(DEF_OPT) -c -o $@ $<
 
 src/upb_def.lo: src/upb_def.c
 	$(E) 'CC -fPIC' $<
-	$(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -O0 -c -o $@ $< -fPIC
+	$(Q) $(CC) $(CFLAGS) $(CPPFLAGS) $(DEF_OPT) -c -o $@ $< -fPIC
 
 src/upb_decoder_x64.o: src/upb_decoder_x64.asm
 	$(E) NASM $<
-- 
cgit v1.2.3