[tor-commits] [torbrowser/maint-2.2] Lin/Win: Disable -Werror for Tor builds for now

[erinn@xxxxxxxxxxxxxx]

commit 86113b905479e984bce96aa2dc4ec182afb68501
Author: Sebastian Hahn <sebastian@xxxxxxxxxxxxxx>
Date:   Fri Apr 27 12:20:46 2012 +0200

    Lin/Win: Disable -Werror for Tor builds for now
    
    openssl 1.0.1 really shouldn't cause programs that link it while using
    -Werror to fail, but of course it does. Yuck.
---
 build-scripts/linux.mk    |    2 +-
 build-scripts/osx.mk      |    2 +-
 build-scripts/versions.mk |    2 +-
 build-scripts/windows.mk  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 6441b25..313c021 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -77,7 +77,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR)
 	cd $(LIBEVENT_DIR) && make install
 	touch $(STAMP_DIR)/build-libevent
 
-TOR_OPTS=--enable-gcc-warnings --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR)
+TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR)
 
 build-pidgin:
 	echo "We're not building pidgin yet!"
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index ed34a9b..a87cf9e 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR)
 
 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)
+TOR_OPTS=--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-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE)
 	cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 9788cfb..e5afa00 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -232,7 +232,7 @@ $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR)
 
 # Common build functionality. Modified by variables set in OS-specific makefiles
 build-tor: build-zlib build-openssl build-libevent $(TOR_DIR)
-	cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS)
+	cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory
 	cd $(TOR_DIR) && make -j $(NUM_CORES)
 	cd $(TOR_DIR) && make install
 	touch $(STAMP_DIR)/build-tor
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 135989f..26075ca 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR)
 
 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)
+TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR)
 build-tor:PATH+=:$(BUILT_DIR)/bin 
 
 build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits