From 19921f2d4045e352bbd9b62ed34dc002f749ecd3 Mon Sep 17 00:00:00 2001
From: Sander Vesik <svesik@openoffice.org>
Date: Thu, 7 Dec 2000 12:08:16 +0000
Subject: Merge changes from OpenOffice609-FU into the main trunk

---
 solenv/inc/unxbsds.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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

diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk
index 107aa2148299..03a93b447d25 100644
--- a/solenv/inc/unxbsds.mk
+++ b/solenv/inc/unxbsds.mk
@@ -12,7 +12,7 @@ CFLAGS+=-w -c $(INCLUDE)
 CFLAGSCC=-pipe 
 CFLAGSEXCEPTIONS=-fexceptions
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-CFLAGSCXX=-pipe -fguiding-decls -frtti
+CFLAGSCXX=-pipe -fguiding-decls -fno-for-scope -frtti -fpermissive
 
 CFLAGSOBJGUIST=
 CFLAGSOBJCUIST=
@@ -31,8 +31,8 @@ CFLAGSOPT=-O -fcse-follow-jumps -fcse-skip-blocks -fexpensive-optimizations -fst
 CFLAGSNOOPT=-O
 CFLAGSOUTOBJ=-o
 
-STATIC=			-Bstatic
-DYNAMIC=		-Bdynamic
+STATIC=			-Wl,-Bstatic
+DYNAMIC=		-Wl,-Bdynamic
 
 THREADLIB=
 LINK= gcc
@@ -90,4 +90,3 @@ DLLPOST=		.so.1.0
 
 LDUMP=
 
-
-- 
cgit