Permalink
Browse files

provide both GNU and ACK based toolchains on Minix

  • Loading branch information...
1 parent 3334836 commit a6dfdcc40b0565e3155060bc4effcde685e13911 @babongo babongo committed Oct 22, 2010
Showing with 41 additions and 7 deletions.
  1. +1 −1 boot/{minix.cfg → minix-ack.cfg}
  2. +6 −0 boot/minix-gnu.cfg
  3. +13 −5 configure.sh
  4. +7 −1 setup/tc_setup.sh
  5. +14 −0 tc/minix-ack.tc
  6. 0 tc/{minix.tc → minix-gnu.tc}
View
2 boot/minix.cfg → boot/minix-ack.cfg
@@ -1,6 +1,6 @@
bourne_shell="/usr/pkg/bin/bash"
gnu_make="/usr/pkg/bin/gmake"
-toolchain_file="tc/minix.tc"
+toolchain_file="tc/minix-ack.tc"
shlib_file="shlib/null.mk"
install_hint="===> ok, now you can 'gmake SHELL=/usr/pkg/bin/bash install' with suitable credentials."
View
6 boot/minix-gnu.cfg
@@ -0,0 +1,6 @@
+bourne_shell="/usr/pkg/bin/bash"
+gnu_make="/usr/pkg/bin/gmake"
+toolchain_file="tc/minix-gnu.tc"
+shlib_file="shlib/null.mk"
+
+install_hint="===> ok, now you can 'gmake SHELL=/usr/pkg/bin/bash install' with suitable credentials."
View
18 configure.sh
@@ -79,12 +79,20 @@ if [ -z "${BOOT_FILE}" ]
then
case $host
in
- linux*) boot_file="boot/linux.cfg" ;;
+ linux*) boot_file="boot/linux.cfg" ;;
darwin*) boot_file="boot/darwin.cfg" ;;
- freebsd*) boot_file="boot/freebsd.cfg" ;;
- netbsd*) boot_file="boot/netbsd.cfg" ;;
- openbsd*) boot_file="boot/openbsd.cfg" ;;
- minix*) boot_file="boot/minix.cfg" ;;
+ freebsd*) boot_file="boot/freebsd.cfg" ;;
+ netbsd*) boot_file="boot/netbsd.cfg" ;;
+ openbsd*) boot_file="boot/openbsd.cfg" ;;
+ minix*)
+ # Prefer GCC if available else fall back to default ACK suite
+ if [ -x "/usr/pkg/bin/gcc" ]
+ then
+ boot_file="boot/minix-gnu.cfg"
+ else
+ boot_file="boot/minix-ack.cfg"
+ fi
+ ;;
sunos*)
grep OpenSolaris /etc/release 2>&1 > /dev/null
if [ $? -ne 0 ]
View
8 setup/tc_setup.sh
@@ -98,7 +98,13 @@ in
;;
minix*)
shlib="null"
- toolchain="minix"
+ # Prefer GCC if available else fall back to default ACK suite
+ if [ -x "/usr/pkg/bin/gcc" ]
+ then
+ toolchain="minix-gnu"
+ else
+ toolchain="minix-ack"
+ fi
;;
*)
shlib="null"
View
14 tc/minix-ack.tc
@@ -0,0 +1,14 @@
+#
+# Tested on Minix 3.1.8 with gcc package installed
+#
+
+CC = cc
+CFLAGS = __UNSET__
+AR = aal
+ARFLAGS = cr
+MKINSTALLDIRS = mkdir -p
+LORDER = echo
+TSORT = cat
+RANLIB = true
+PRE_LDADD = __UNSET__
+POST_LDADD = __UNSET__
View
0 tc/minix.tc → tc/minix-gnu.tc
File renamed without changes.

0 comments on commit a6dfdcc

Please sign in to comment.