X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Makefile.cfg;h=d12710cf90852936131825e5ad44055a786b681c;hb=98bd9c0c8985c50c42231c116a4e18fedd47761e;hp=29f13466531421896b3712e90d02fba67d1d46c0;hpb=f8c904ed88c0722b1e99baaf2c6c0fb7597a3be9;p=tpg%2Facess2.git diff --git a/Makefile.cfg b/Makefile.cfg index 29f13466..d12710cf 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -2,6 +2,8 @@ # Acess2 Build Configuration # +V ?= @ + ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST))) ACESSDIR := $(shell cd $(ACESSDIR) && pwd) @@ -17,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 @@ -37,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))