Merge branch 'master' of git://factorcode.org/git/factor
commit
ea95cc017e
|
@ -15,7 +15,7 @@ then
|
||||||
elif [ \( `uname -s` = NetBSD \) -a \( `uname -p` = i386 \) ]
|
elif [ \( `uname -s` = NetBSD \) -a \( `uname -p` = i386 \) ]
|
||||||
then
|
then
|
||||||
echo netbsd-x86-32
|
echo netbsd-x86-32
|
||||||
elif [ \( `uname -s` = NetBSD \) -a \( `uname -p` = amd64 \) ]
|
elif [ \( `uname -s` = NetBSD \) -a \( `uname -p` = x86_64 \) ]
|
||||||
then
|
then
|
||||||
echo netbsd-x86-64
|
echo netbsd-x86-64
|
||||||
elif [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ]
|
elif [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ]
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
USING: kernel system io.files.unique.backend
|
USING: kernel system io.files.unique.backend
|
||||||
windows.kernel32 io.windows io.nonblocking ;
|
windows.kernel32 io.windows io.nonblocking windows ;
|
||||||
IN: io.windows.files.unique
|
IN: io.windows.files.unique
|
||||||
|
|
||||||
M: windows-io (make-unique-file) ( path -- )
|
M: windows-io (make-unique-file) ( path -- )
|
||||||
|
|
|
@ -88,6 +88,9 @@ set_md5sum() {
|
||||||
set_gcc() {
|
set_gcc() {
|
||||||
case $OS in
|
case $OS in
|
||||||
openbsd) ensure_program_installed egcc; CC=egcc;;
|
openbsd) ensure_program_installed egcc; CC=egcc;;
|
||||||
|
netbsd) if [[ $WORD -eq 64 ]] ; then
|
||||||
|
CC=/usr/pkg/gcc34/bin/gcc
|
||||||
|
fi ;;
|
||||||
*) CC=gcc;;
|
*) CC=gcc;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue