From 2c5ccf717cfae0e66babb4bb91e613054d8cb18f Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 1 Nov 2006 13:07:28 +0000
Subject: INTEGRATION: CWS mhu13 (1.28.56); FILE MERGED 2006/10/17 08:27:57 mhu
 1.28.56.1: #i70488# Mark application stacks non-executable.

---
 solenv/inc/unxsols4.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'solenv/inc/unxsols4.mk')

diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 30085155c4e3..6025c65d2955 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: unxsols4.mk,v $
 #
-#   $Revision: 1.29 $
+#   $Revision: 1.30 $
 #
-#   last change: $Author: obo $ $Date: 2006-10-12 13:50:39 $
+#   last change: $Author: vg $ $Date: 2006-11-01 14:07:28 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -178,6 +178,11 @@ LINKFLAGSDEBUG=
 LINKFLAGSOPT=
 LINKVERSIONMAPFLAG=-M
 
+# mapfile for non-executable stack
+LINKFLAGSNOEXSTK*=$(LINKVERSIONMAPFLAG) $(SOLARENV)/src/solaris_noexstk.map
+LINKFLAGSAPPGUI+=$(LINKFLAGSNOEXSTK)
+LINKFLAGSAPPCUI+=$(LINKFLAGSNOEXSTK)
+
 APPLINKSTATIC=$(STATIC)
 APPLINKSHARED=$(DIRECT)
 APP_LINKTYPE=
-- 
cgit v1.2.3