# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1363638381 25200
# Node ID 3de6dd637a9a8eeb1f4eeababcc933586bf3b7ba
# Parent  f4649643b3ba58a293204e2dc7ba6e0fc31b717e
16499563 curl and erlang should have ASLR enabled

diff -r f4649643b3ba -r 3de6dd637a9a components/curl/Makefile
--- a/components/curl/Makefile	Mon Mar 18 10:49:03 2013 -0700
+++ b/components/curl/Makefile	Mon Mar 18 13:26:21 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -75,6 +75,8 @@
 
 LINT_FLAGS += -I$(SOURCE_DIR)/include
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 build: $(BUILD_32_and_64)
 
 install: $(INSTALL_32_and_64)
diff -r f4649643b3ba -r 3de6dd637a9a components/erlang/Makefile
--- a/components/erlang/Makefile	Mon Mar 18 10:49:03 2013 -0700
+++ b/components/erlang/Makefile	Mon Mar 18 13:26:21 2013 -0700
@@ -100,6 +100,8 @@
 
 COMPONENT_INSTALL_ARGS += INSTALL_PREFIX=$(PROTO_DIR)
 
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
 build:	$(BUILD_32_and_64)