diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-03-14 16:53:43 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-03-14 16:53:43 +0000 |
| commit | ee44ebc3c3527b38d69aefca11adb21ddaa4ad2a (patch) | |
| tree | 2643a4c994ea1a8c79f54b9b8f537c523343a72a /editors/openoffice-1.1-devel/files | |
| parent | Remove $cc and $CC defines from unxfbsd.mk, and do the changes for (diff) | |
Remove hardcoded $cc and $CC
Notes
Notes:
svn path=/head/; revision=56095
Diffstat (limited to 'editors/openoffice-1.1-devel/files')
| -rw-r--r-- | editors/openoffice-1.1-devel/files/patch-solenv::inc::unxfbsdi.mk | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice-1.1-devel/files/patch-solenv::inc::unxfbsdi.mk index 3a9f86bb8d2f..f4d271722670 100644 --- a/editors/openoffice-1.1-devel/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice-1.1-devel/files/patch-solenv::inc::unxfbsdi.mk @@ -1,6 +1,6 @@ --- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Wed Mar 13 19:13:59 2002 -@@ -1,84 +1,145 @@ ++++ ../solenv/inc/unxfbsdi.mk Thu Mar 14 17:26:41 2002 +@@ -1,84 +1,139 @@ - # mak file fuer unxfbsdi @@ -16,12 +16,6 @@ +# not needed at the moment LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" -+# name of C Compiler -+cc=$(CC) -+ -+# name of C++ Compiler -+CC=$(CXX) -+ +# options for C and C++ Compiler +CDEFS+=-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) +CDEFS+=$(PTHREAD_CFLAGS) @@ -57,6 +51,10 @@ +# Compiler flags for compiling static object in single threaded +# environment with character user interface +CFLAGSOBJCUIST=-fPIC ++ ++# Compiler flags for compiling static object in multi threaded ++# environment with graphical user interface ++CFLAGSOBJGUIMT=-fPIC -cc= gcc -CC= g++ @@ -77,10 +75,6 @@ -CFLAGSPROF= -pg -CFLAGSDEBUG= -g +# Compiler flags for compiling static object in multi threaded -+# environment with graphical user interface -+CFLAGSOBJGUIMT=-fPIC -+ -+# Compiler flags for compiling static object in multi threaded +# environment with character user interface +CFLAGSOBJCUIMT=-fPIC + @@ -195,7 +189,7 @@ IMPLIB= IMPLIBFLAGS= -@@ -87,12 +148,12 @@ +@@ -87,12 +142,12 @@ MAPSYMFLAGS= RC=irc |