diff options
Diffstat (limited to 'xc/config/cf/FreeBSD.cf')
-rw-r--r-- | xc/config/cf/FreeBSD.cf | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/xc/config/cf/FreeBSD.cf b/xc/config/cf/FreeBSD.cf index 3a9e78a73..c92902d37 100644 --- a/xc/config/cf/FreeBSD.cf +++ b/xc/config/cf/FreeBSD.cf @@ -2,7 +2,7 @@ XCOMM platform: $TOG: FreeBSD.cf /main/21 1997/10/05 20:42:34 kaleb $ XCOMM XCOMM XCOMM -XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.85 1999/05/22 08:39:55 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.91 2000/02/15 13:51:38 dawes Exp $ #ifndef UseElfFormat #define UseElfFormat DefaultToElfFormat @@ -52,6 +52,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define HasWChar32 YES #define HasUsableFileMmap YES #define HasNCurses YES +#define HasVarRun YES +#define HasVarDb YES #define AvoidNullMakeCommand YES #define StripInstalledPrograms YES @@ -68,15 +70,19 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define MkdirHierCmd mkdir -p +#ifndef LexCmd +#define LexCmd flex -l +#endif + #define CcCmd cc -#define CppCmd /usr/libexec/cpp +#define CppCmd /usr/bin/cpp #define PreProcessCmd CppCmd #define StandardCppOptions -traditional #define StandardCppDefines /**/ #if defined(UseInstalled) #define DefaultCCOptions /**/ #else -#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions +/*#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions*/ #endif #ifndef ExtraLibraries /* support for multi-byte locales is in libxpg4 rather than libc */ @@ -300,7 +306,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe # define AsmDefines AsmElfDefines #endif +#ifdef i386Architecture #define ServerExtraDefines GccGasOption XFree86ServerDefines +#endif +#ifdef AlphaArchitecture +#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 +#endif #define StandardDefines -DCSRG_BASED @@ -332,7 +343,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #ifdef i386Architecture # define OptimizedCDebugFlags DefaultGcc2i386Opt #else -# define OptimizedCDebugFlags -O2 +# define OptimizedCDebugFlags -O #endif #ifndef PreIncDir @@ -395,8 +406,8 @@ install.man:: list @@\ MakeDir($(DESTDIR)dest) @@\ @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ for i in list; do \ @@\ - (set -x; \ @@\ - MNAME=`echo $$i | cut -f1 -d.`; \ @@\ + (MNAME=`echo $$i | cut -f1 -d.`; \ @@\ + set -x; \ @@\ $(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\ $(INSTALL) -c $(INSTMANFLAGS) $$i \ @@\ $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\ @@ -441,8 +452,22 @@ install.man:: @@\ #define DlLibrary /**/ #endif +#ifdef AlphaArchitecture +#define IoLibrary -lio +#else +#define IoLibrary /**/ +#endif + +#define ServerExtraSysLibs IoLibrary + +/* + * A hack to work around an optimisation problem with the compiler on + * FreeBSD 4.0-current in late 1999/early 2000. + */ +#if (OSMajorVersion == 4 || OSMajorVersion == 5) && OSMinorVersion == 0 && OSTeenyVersion == 0 +#define FreeBSDGccOptBug +#endif + #include <bsdLib.rules> -#ifdef i386Architecture #include <xfree86.cf> -#endif |