[tor-commits] [orbot/master] make sure polipo is really cleaned; add only PIE flags for polipo

[n8fr8@xxxxxxxxxxxxxx]

commit 16d87310a3a0f8a07a3bd1fd8f5f680c52c06a15
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
Date:   Mon Nov 17 14:11:17 2014 -0500

    make sure polipo is really cleaned; add only PIE flags for polipo
---
 external/Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/external/Makefile b/external/Makefile
index 4af1016..999c24d 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -281,7 +281,7 @@ obfsclient-clean:
 # polipo
 
 polipo-build-stamp: 
-	CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) -C polipo
+	CC="$(CC)" CFLAGS="$(PIEFLAGS)" LDFLAGS="$(PIEFLAGS)" $(MAKE) -C polipo
 	touch polipo-build-stamp
 
 polipo: polipo-build-stamp
@@ -289,6 +289,7 @@ polipo: polipo-build-stamp
 	cp polipo/polipo bin
 
 polipo-clean:
+	-rm -f polipo/polipo
 	-rm -f bin/polipo
 	-rm -f polipo-build-stamp
 



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