INSTALL: fix build on Snow Leopard

http://codereview.appspot.com/116073
This commit is contained in:
Russ Cox 2009-09-11 13:51:50 -04:00
parent a673ea2203
commit fa662c9571
10 changed files with 30 additions and 4 deletions

8
bin/9a
View file

@ -5,5 +5,11 @@ if [ $# != 1 ]; then
exit 1 exit 1
fi fi
aflags=""
case "`uname`" in
Darwin)
aflags="-arch i386"
esac
out=`echo $1 | sed 's/\.s$//;s/$/.o/'` out=`echo $1 | sed 's/\.s$//;s/$/.o/'`
exec as -o $out $1 exec as $aflags -o $out $1

4
bin/9c
View file

@ -25,7 +25,7 @@ tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}-${CC9:-cc}"
case "$tag" in case "$tag" in
*BSD*) usegcc ;; *BSD*) usegcc ;;
*Darwin*) usegcc *Darwin*) usegcc
cflags="$ngflags -g3 -no-cpp-precomp" ;; cflags="$ngflags -g3 -no-cpp-precomp -m32" ;;
*HP-UX*) cc=cc; cflags="-g -O -c -Ae" ;; *HP-UX*) cc=cc; cflags="-g -O -c -Ae" ;;
*Linux*) usegcc *Linux*) usegcc
case "${CC9:-gcc}" in case "${CC9:-gcc}" in
@ -76,7 +76,7 @@ xtmp=/tmp/9c.$$.$USER.out
$cc -DPLAN9PORT -I$PLAN9/include $cflags "$@" 2>$xtmp $cc -DPLAN9PORT -I$PLAN9/include $cflags "$@" 2>$xtmp
status=$? status=$?
grep -v '__p9l_autolib_' $xtmp | grep -v '__p9l_autolib_' $xtmp |
egrep -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|In file included from| from|use of C99 long long|ISO C forbids conversion|Cursor. is deprecated|warn_unused_result' | egrep -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|In file included from| from|use of C99 long long|ISO C forbids conversion|is deprecated|warn_unused_result' |
sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' | sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' |
uniq 1>&2 uniq 1>&2
rm -f $xtmp $xtmp.status rm -f $xtmp $xtmp.status

2
bin/9l
View file

@ -46,7 +46,7 @@ case "$tag" in
esac esac
;; ;;
*Darwin*) *Darwin*)
ld=gcc ld="gcc -m32"
;; ;;
*SunOS*) *SunOS*)
ld="${CC9:-cc} -g" ld="${CC9:-cc} -g"

View file

@ -18,6 +18,8 @@ extern int class[LAST][LAST];
#define max(x,y) (((x) >= (y)) ? (x) : (y)) /* beware of side effects */ #define max(x,y) (((x) >= (y)) ? (x) : (y)) /* beware of side effects */
#define min(x,y) (((x) <= (y)) ? (x) : (y)) #define min(x,y) (((x) <= (y)) ? (x) : (y))
#undef sprintf /* Snow Leopard */
extern char errbuf[200]; extern char errbuf[200];
extern char *cmdname; extern char *cmdname;
#define ERROR sprintf(errbuf, #define ERROR sprintf(errbuf,

View file

@ -1,4 +1,7 @@
extern char errbuf[200]; extern char errbuf[200];
#undef sprintf /* Snow Leopard */
#define ERROR sprintf(errbuf, #define ERROR sprintf(errbuf,
#define FATAL ), yyerror(errbuf), exit(1) #define FATAL ), yyerror(errbuf), exit(1)
#define WARNING ), yyerror(errbuf) #define WARNING ), yyerror(errbuf)

View file

@ -10,6 +10,9 @@
extern void yyerror(char *); extern void yyerror(char *);
extern char errbuf[200]; extern char errbuf[200];
#undef sprintf /* Snow Leopard */
#define ERROR sprintf(errbuf, #define ERROR sprintf(errbuf,
#define FATAL ), yyerror(errbuf), exit(1) #define FATAL ), yyerror(errbuf), exit(1)
#define WARNING ), yyerror(errbuf) #define WARNING ), yyerror(errbuf)

View file

@ -12,6 +12,9 @@
#define dprintf if(dbg)printf #define dprintf if(dbg)printf
extern char errbuf[200]; extern char errbuf[200];
#undef sprintf /* Snow Leopard */
#define ERROR sprintf(errbuf, #define ERROR sprintf(errbuf,
#define FATAL ), yyerror(errbuf), exit(1) #define FATAL ), yyerror(errbuf), exit(1)
#define WARNING ), yyerror(errbuf) #define WARNING ), yyerror(errbuf)

View file

@ -68,6 +68,8 @@ typedef struct Tbuf Tbuf;
#define oputs(a) OUT "%s", a PUT #define oputs(a) OUT "%s", a PUT
#define oput(c) ( *obufp++ = (c), obufp > obuf+BUFSIZ ? flusho() : 1 ) #define oput(c) ( *obufp++ = (c), obufp > obuf+BUFSIZ ? flusho() : 1 )
#undef sprintf /* Snow Leopard */
extern char errbuf[]; extern char errbuf[];
#define ERROR sprintf(errbuf, #define ERROR sprintf(errbuf,
#define WARN ), errprint() #define WARN ), errprint()

View file

@ -1,3 +1,7 @@
#if defined(__APPLE__)
#define _DARWIN_NO_64_BIT_INODE /* Snow Leopard */
#endif
#include <u.h> #include <u.h>
#define NOPLAN9DEFINES #define NOPLAN9DEFINES
#include <libc.h> #include <libc.h>

View file

@ -6,6 +6,9 @@
#include <sched.h> #include <sched.h>
#include <signal.h> #include <signal.h>
#if !defined(__OpenBSD__) #if !defined(__OpenBSD__)
# if defined(__APPLE__)
# define _XOPEN_SOURCE /* for Snow Leopard */
# endif
# include <ucontext.h> # include <ucontext.h>
#endif #endif
#include <sys/utsname.h> #include <sys/utsname.h>