[tor-commits] [torbrowser/maint-2.2] Win/OSX: Remove -O -g from libevent, tor cflags

[erinn at torproject.org]

commit 6fdf347054540320c9e624b21cd34ca4392ac4b1
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Wed Apr 11 17:58:51 2012 +0200

    Win/OSX: Remove -O -g from libevent, tor cflags
---
 build-scripts/osx.mk     |    4 ++--
 build-scripts/windows.mk |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 68e13fe..a39eb94 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -85,7 +85,7 @@ build-vidalia: build-openssl build-qt $(VIDALIA_DIR)
 	cd $(VIDALIA_DIR)/build && DESTDIR=$(BUILT_DIR) make install
 	touch $(STAMP_DIR)/build-vidalia
 
-LIBEVENT_CFLAGS="-O -g -arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)"
+LIBEVENT_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION) -arch $(ARCH_TYPE)"
 LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)"
 LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking $(CC)
 build-libevent: build-zlib build-openssl $(LIBEVENT_DIR)
@@ -94,7 +94,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR)
 	cd $(LIBEVENT_DIR) && make install
 	touch $(STAMP_DIR)/build-libevent
 
-TOR_CFLAGS="-O -g -arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)"
+TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)"
 TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)"
 TOR_OPTS=--enable-gcc-warnings-advisory --enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC)
 build-tor: build-zlib build-openssl build-libevent $(TOR_DIR)
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index dc8de89..505e5b6 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -86,7 +86,7 @@ build-vidalia: build-openssl $(VIDALIA_DIR)
 	cd $(VIDALIA_DIR)/build && make -j $(NUM_CORES)
 	touch $(STAMP_DIR)/build-vidalia
 
-LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g"
+LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include"
 LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase"
 LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking
 build-libevent: build-zlib build-openssl $(LIBEVENT_DIR)
@@ -95,7 +95,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR)
 	cd $(LIBEVENT_DIR) && make install
 	touch $(STAMP_DIR)/build-libevent
 
-TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include"
+TOR_CFLAGS="-I$(BUILT_DIR)/include"
 TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin"
 TOR_OPTS=--enable-gcc-warnings --enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR)
 build-tor:PATH+=:$(BUILT_DIR)/bin