[tor-commits] [torbrowser/master] enable gcc hardening

[erinn at torproject.org]

commit a35eea514494e0c18ab6db14bab23ff9145cb04d
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Sep 17 17:28:50 2013 +0200

    enable gcc hardening
---
 build-scripts/versions-alpha.mk |    2 +-
 build-scripts/versions.mk       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk
index 088b27c..5285eb7 100644
--- a/build-scripts/versions-alpha.mk
+++ b/build-scripts/versions-alpha.mk
@@ -220,7 +220,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) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) --disable-gcc-hardening 2>&1 | tee configuring.log
+	cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) 2>&1 | tee configuring.log
 	cd $(TOR_DIR) && make -j $(NUM_CORES) 2>&1 | tee build.log
 	cd $(TOR_DIR) && make install
 	touch $(STAMP_DIR)/build-tor
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 55cd175..534d9f1 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -214,7 +214,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) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) --disable-gcc-hardening 2>&1 | tee configuring.log
+	cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) 2>&1 | tee configuring.log
 	cd $(TOR_DIR) && make -j $(NUM_CORES) 2>&1 | tee build.log
 	cd $(TOR_DIR) && make install
 	touch $(STAMP_DIR)/build-tor