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/librsync/Makefile | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/components/librsync/Makefile b/components/librsync/Makefile index 721a429..e00489c 100644 --- a/components/librsync/Makefile +++ b/components/librsync/Makefile @@ -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 @@ -63,6 +63,8 @@ PATCH_LEVEL = 1 +ASLR_MODE = $(ASLR_ENABLE) + build: $(BUILD_32_and_64) install: $(INSTALL_32_and_64) -- Gitblit v1.9.3