18054509 Update zip to ASLR + 64b
authorJiri Kukacka <jiri.kukacka@oracle.com>
Thu, 09 Jan 2014 05:51:38 -0800
changeset 1657 5612d6ef4c2b
parent 1656 42add1f5f182
child 1658 6fd28f9584ed
18054509 Update zip to ASLR + 64b
components/zip/Makefile
--- a/components/zip/Makefile	Tue Jan 14 08:30:50 2014 -0800
+++ b/components/zip/Makefile	Thu Jan 09 05:51:38 2014 -0800
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -50,10 +50,13 @@
 COMPONENT_INSTALL_ARGS += BINDIR=$(PROTOUSRBINDIR)
 COMPONENT_INSTALL_ARGS += MANDIR=$(PROTOUSRSHAREMAN1DIR)
 
+# Enable ASLR for this component
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)