mirror of
https://github.com/boostorg/build.git
synced 2026-02-17 01:32:12 +00:00
Apply patches from Patrick Mauritz, with some changes, to account for DragonFly, a FreeBSD variant.
[SVN r25782]
This commit is contained in:
@@ -231,10 +231,14 @@
|
||||
# define OSMINOR "OS=CYGWIN"
|
||||
# define OS_CYGWIN
|
||||
# endif
|
||||
# ifdef __FreeBSD__
|
||||
# if defined(__FreeBSD__) && !defined(__DragonFly__)
|
||||
# define OSMINOR "OS=FREEBSD"
|
||||
# define OS_FREEBSD
|
||||
# endif
|
||||
# ifdef __DragonFly__
|
||||
# define OSMINOR "OS=DRAGONFLYBSD"
|
||||
# define OS_DRAGONFLYBSD
|
||||
# endif
|
||||
# ifdef __DGUX__
|
||||
# define OSMINOR "OS=DGUX"
|
||||
# define OS_DGUX
|
||||
@@ -394,6 +398,7 @@
|
||||
|
||||
# if !defined(OS_BSDI) && \
|
||||
!defined(OS_FREEBSD) && \
|
||||
!defined(OS_DRAGONFLYBSD) && \
|
||||
!defined(OS_NEXT) && \
|
||||
!defined(OS_MACHTEN) && \
|
||||
!defined(OS_MACOSX) && \
|
||||
@@ -426,6 +431,7 @@
|
||||
defined( __i386__ ) || \
|
||||
defined( _M_IX86 )
|
||||
# if !defined( OS_FREEBSD ) && \
|
||||
!defined( OS_DRAGONFLYBSD ) && \
|
||||
!defined( OS_OS2 ) && \
|
||||
!defined( OS_AS400 )
|
||||
# define OSPLAT "OSPLAT=X86"
|
||||
|
||||
@@ -231,10 +231,14 @@
|
||||
# define OSMINOR "OS=CYGWIN"
|
||||
# define OS_CYGWIN
|
||||
# endif
|
||||
# ifdef __FreeBSD__
|
||||
# if defined(__FreeBSD__) && !defined(__DragonFly__)
|
||||
# define OSMINOR "OS=FREEBSD"
|
||||
# define OS_FREEBSD
|
||||
# endif
|
||||
# ifdef __DragonFly__
|
||||
# define OSMINOR "OS=DRAGONFLYBSD"
|
||||
# define OS_DRAGONFLYBSD
|
||||
# endif
|
||||
# ifdef __DGUX__
|
||||
# define OSMINOR "OS=DGUX"
|
||||
# define OS_DGUX
|
||||
@@ -394,6 +398,7 @@
|
||||
|
||||
# if !defined(OS_BSDI) && \
|
||||
!defined(OS_FREEBSD) && \
|
||||
!defined(OS_DRAGONFLYBSD) && \
|
||||
!defined(OS_NEXT) && \
|
||||
!defined(OS_MACHTEN) && \
|
||||
!defined(OS_MACOSX) && \
|
||||
@@ -426,6 +431,7 @@
|
||||
defined( __i386__ ) || \
|
||||
defined( _M_IX86 )
|
||||
# if !defined( OS_FREEBSD ) && \
|
||||
!defined( OS_DRAGONFLYBSD ) && \
|
||||
!defined( OS_OS2 ) && \
|
||||
!defined( OS_AS400 )
|
||||
# define OSPLAT "OSPLAT=X86"
|
||||
|
||||
@@ -129,6 +129,13 @@ else if $(UNIX)
|
||||
flags gcc LINKFLAGS <threading>multi : -pthread ;
|
||||
# there is no -lrt on BSD
|
||||
}
|
||||
case DragonFly :
|
||||
{
|
||||
flags gcc CFLAGS <threading>multi : -pthread ;
|
||||
flags gcc LINKFLAGS <threading>multi : -pthread ;
|
||||
# there is no -lrt on BSD - DragonFly is a FreeBSD variant,
|
||||
# which anoyingly doesn't say it's a *BSD.
|
||||
}
|
||||
case IRIX :
|
||||
{
|
||||
# gcc on IRIX does not support multi-threading, don't set anything here.
|
||||
|
||||
@@ -298,6 +298,12 @@ else if [ modules.peek : UNIX ]
|
||||
flags gcc OPTIONS <threading>multi : -pthread ;
|
||||
# there is no -lrt on BSD
|
||||
}
|
||||
case DragonFly :
|
||||
{
|
||||
flags gcc OPTIONS <threading>multi : -pthread ;
|
||||
# there is no -lrt on BSD - DragonFly is a FreeBSD variant,
|
||||
# which anoyingly doesn't say it's a *BSD.
|
||||
}
|
||||
case IRIX :
|
||||
{
|
||||
# gcc on IRIX does not support multi-threading, don't set anything here.
|
||||
|
||||
Reference in New Issue
Block a user