Merge branch 'master' of git://factorcode.org/git/factor
commit
2bb19fe13b
|
@ -175,6 +175,7 @@ find_os() {
|
||||||
*FreeBSD*) OS=freebsd;;
|
*FreeBSD*) OS=freebsd;;
|
||||||
*OpenBSD*) OS=openbsd;;
|
*OpenBSD*) OS=openbsd;;
|
||||||
*DragonFly*) OS=dragonflybsd;;
|
*DragonFly*) OS=dragonflybsd;;
|
||||||
|
SunOS) OS=solaris;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -186,6 +187,7 @@ find_architecture() {
|
||||||
case $uname_m in
|
case $uname_m in
|
||||||
i386) ARCH=x86;;
|
i386) ARCH=x86;;
|
||||||
i686) ARCH=x86;;
|
i686) ARCH=x86;;
|
||||||
|
i86pc) ARCH=x86;;
|
||||||
amd64) ARCH=x86;;
|
amd64) ARCH=x86;;
|
||||||
ppc64) ARCH=ppc;;
|
ppc64) ARCH=ppc;;
|
||||||
*86) ARCH=x86;;
|
*86) ARCH=x86;;
|
||||||
|
@ -261,6 +263,7 @@ check_os_arch_word() {
|
||||||
$ECHO "ARCH: $ARCH"
|
$ECHO "ARCH: $ARCH"
|
||||||
$ECHO "WORD: $WORD"
|
$ECHO "WORD: $WORD"
|
||||||
$ECHO "OS, ARCH, or WORD is empty. Please report this."
|
$ECHO "OS, ARCH, or WORD is empty. Please report this."
|
||||||
|
echo $MAKE_TARGET
|
||||||
exit 5
|
exit 5
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -486,6 +489,8 @@ usage() {
|
||||||
echo " $0 update macosx-x86-32"
|
echo " $0 update macosx-x86-32"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MAKE_TARGET=unknown
|
||||||
|
|
||||||
# -n is nonzero length, -z is zero length
|
# -n is nonzero length, -z is zero length
|
||||||
if [[ -n "$2" ]] ; then
|
if [[ -n "$2" ]] ; then
|
||||||
parse_build_info $2
|
parse_build_info $2
|
||||||
|
|
Loading…
Reference in New Issue