⛏️ index : buildtools.git

author Ingo Weinhold <ingo_weinhold@gmx.de> 2008-03-28 14:14:44.0 +00:00:00
committer Ingo Weinhold <ingo_weinhold@gmx.de> 2008-03-28 14:14:44.0 +00:00:00
commit
7b6de8037da02e9c5a1eec00bf9ba961f7767807 [patch]
tree
9d81d1c36f38935285ec8be2ce06c2e10e285c15
parent
dc17bbe506bd68ec8893505c6ddb04b166017bb2
download
7b6de8037da02e9c5a1eec00bf9ba961f7767807.tar.gz

Ported to Haiku.

git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@24623 a95241bf-73f2-0310-859d-f6bbb57e9c96

Diff

 jam/Jambase      | 2 +-
 jam/fileunix.c   | 1 +
 jam/jam.h        | 7 +++++++
 jam/patchlevel.h | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/jam/Jambase b/jam/Jambase
index 347697d..187f2d3 100644
--- a/jam/Jambase
+++ b/jam/Jambase
@@ -396,7 +396,7 @@
	YACCFILES	?= y.tab ;
	YACCFLAGS	?= -d ;
}
else if $(OS) = BEOS 
else if $(OS) = BEOS || $(OS) = HAIKU
{
	BINDIR		?= /boot/home/config/bin ;
	CC		?= gcc ;
diff --git a/jam/fileunix.c b/jam/fileunix.c
index 49ce110..9b5e3d2 100644
--- a/jam/fileunix.c
+++ b/jam/fileunix.c
@@ -86,6 +86,7 @@

# if defined( OS_QNX ) || \
     defined( OS_BEOS ) || \
     defined( OS_HAIKU ) || \
     defined( OS_MPEIX )
# define NO_AR
# define HAVE_AR
diff --git a/jam/jam.h b/jam/jam.h
index 58081df..1252302 100644
--- a/jam/jam.h
+++ b/jam/jam.h
@@ -208,7 +208,7 @@
# define OSMINOR "OS=AMIGA"
# define OS_AMIGA
# endif
# ifdef __BEOS__
# if defined(__BEOS__) && !defined(__HAIKU__)

# define unix
# define OSMINOR "OS=BEOS"
# define OS_BEOS
@@ -234,6 +234,11 @@
# ifdef __DGUX__
# define OSMINOR "OS=DGUX"
# define OS_DGUX
# endif
# ifdef __HAIKU__
# define unix
# define OSMINOR "OS=HAIKU"
# define OS_HAIKU
# endif
# ifdef __hpux
# define OSMINOR "OS=HPUX"
diff --git a/jam/patchlevel.h b/jam/patchlevel.h
index 854e43c..fac9205 100644
--- a/jam/patchlevel.h
+++ b/jam/patchlevel.h
@@ -1,5 +1,5 @@
/* Keep JAMVERSYM in sync with VERSION. */
/* It can be accessed as $(JAMVERSION) in the Jamfile. */

#define VERSION "2.5-haiku-20060813"
#define VERSION "2.5-haiku-20080327"
#define JAMVERSYM "JAMVERSION=2.5"