X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=d12710cf90852936131825e5ad44055a786b681c;hb=6274aaa8894e14462a36c69090e2f9235f130e31;hp=daa9d94940945bf9395e31052bb02aa70e5830e6;hpb=920d4ea51ca96d1f3dc286928417864ea1200f96;p=tpg%2Facess2.git

diff --git a/Makefile.cfg b/Makefile.cfg
index daa9d949..d12710cf 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -2,12 +2,15 @@
 # Acess2 Build Configuration
 #
 
+V ?= @
+
 ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST)))
 ACESSDIR := $(shell cd $(ACESSDIR) && pwd)
 
 # Install destination configuration
 DISTROOT := -i $(ACESSDIR)/Acess2.img ::/Acess2
 NCC := $(CC)
+NCXX := $(CXX)
 xCP := mcopy -D o
 xMKDIR := mmd -D s
 
@@ -16,7 +19,6 @@ xMKDIR := mmd -D s
 # Default build programs
 #CC := gcc
 #LD := ld
-AS := nasm
 DISASM := objdump -d -S
 RM := @rm -f
 STRIP := strip
@@ -36,10 +38,15 @@ ifeq ($(ARCHDIR),)
 endif
 
 # Default compilers
+ifneq ($(ARCHDIR),native)
 CC  = $(COMPILERDIR)bin/$(TRIPLET)-gcc
 CXX = $(COMPILERDIR)bin/$(TRIPLET)-g++
 LD  = $(COMPILERDIR)bin/$(TRIPLET)-ld
 OBJDUMP = $(COMPILERDIR)bin/$(TRIPLET)-objdump
+ ifeq ($(AS),as)
+  AS = $(COMPILERDIR)bin/$(TRIPLET)-gcc -c
+ endif
+endif
 
 ifneq ($(ARCH),host)
  ifneq ($(ARCHDIR),$(ARCH))