From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster

---
 components/python/python27/Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/components/python/python27/Makefile b/components/python/python27/Makefile
index 5082368..46811c0 100644
--- a/components/python/python27/Makefile
+++ b/components/python/python27/Makefile
@@ -118,6 +118,8 @@
              $(MV) include/python2.7/pyconfig.h include/python2.7/pyconfig-$(BITS).h ; \
              $(TOUCH) lib/python2.7/lib2to3/*.pickle)
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
 $(INSTALL_32):  $(INSTALL_64)
 build:		$(BUILD_32_and_64)

--
Gitblit v1.9.3