Add 'gcc46' as a CCVER value (using /usr/pkgsrc/lang/gnat-aux).

So far I've tested building and running our kernel (which both works).

World hasn't been tested and would fail using default values, since
gnat-aux so far only supports C and Ada.

Many thanks to John Marino <john@marino.st> who did and maintains the
lang/gnat-aux package.

diff --git a/etc/defaults/compilers.conf b/etc/defaults/compilers.conf
index d443e8a..a10c4bd 100644 (file)
--- a/etc/defaults/compilers.conf
+++ b/etc/defaults/compilers.conf
@@ -11,3 +11,8 @@ clangsvn_VERSION=4.1.2
 clang_CC=/usr/pkg/bin/clang
 clang_CFLAGS="-fno-color-diagnostics -Qunused-arguments -std=gnu89"
 clang_VERSION=4.1.2
+
+# gnat-aux (i.e. gcc 4.6) from pkgsrc
+#
+gcc46_CC=/usr/pkg/bin/gnatgcc
+gcc46_CPP=/usr/pkg/bin/gnatcpp

diff --git a/libexec/customcc/cc.sh b/libexec/customcc/cc.sh
index 9523193..8755ef6 100644 (file)
--- a/libexec/customcc/cc.sh
+++ b/libexec/customcc/cc.sh
@@ -34,6 +34,10 @@ elif [ "${CCVER}" = "clangsvn" ]; then
                    -isystem /usr/include \
                    -isystem /usr/include/c++/4.4"
        fi
+elif [ "${CCVER}" = "gcc46" ]; then
+       INCOPT="-nostdinc \
+           -isysroot @@INCPREFIX@@ \
+           -isystem /usr/include"
 fi
 
 . /etc/defaults/compilers.conf

diff --git a/share/man/man5/compilers.conf.5 b/share/man/man5/compilers.conf.5
index d724dac..30dddcb 100644 (file)
--- a/share/man/man5/compilers.conf.5
+++ b/share/man/man5/compilers.conf.5
@@ -29,7 +29,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 4, 2010
+.Dd February 25, 2011
 .Os
 .Dt COMPILERS.CONF 5
 .Sh NAME
@@ -104,11 +104,15 @@ Currently, defaults are provided for
 .Nm clang
 (installed from
 .Xr pkgsrc 7 Ap s
-.Pa lang/clang )
-and
+.Pa lang/clang ),
 .Nm clangsvn
 (installed from SVN trunk as described in
-.Pa http://clang.llvm.org/get_started.html ) .
+.Pa http://clang.llvm.org/get_started.html )
+and
+.Nm gcc46
+(installed from
+.Xr pkgsrc 7 Ap s
+.Pa lang/gnat-aux ) .
 .Sh IMPLEMENTATION NOTES
 In
 .Dx ,