Index: share/mk/sys.mk =================================================================== --- share/mk/sys.mk (revision 220289) +++ share/mk/sys.mk (working copy) @@ -31,23 +31,23 @@ .SUFFIXES: .out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh .endif -AR ?= ar +AR ?= ${__X}ar .if defined(%POSIX) ARFLAGS ?= -rv .else ARFLAGS ?= rl .endif -RANLIB ?= ranlib +RANLIB ?= ${__X}ranlib -AS ?= as +AS ?= ${__X}as AFLAGS ?= ACFLAGS ?= .if defined(%POSIX) -CC ?= c89 +CC ?= ${__X}c89 CFLAGS ?= -O .else -CC ?= cc +CC ?= ${__X}cc .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "mips" CFLAGS ?= -O -pipe .else @@ -79,11 +79,11 @@ #CFLAGS += -g .endif -CXX ?= c++ +CXX ?= ${__X}c++ CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign:N-Wold-style-definition} PO_CXXFLAGS ?= ${CXXFLAGS} -CPP ?= cpp +CPP ?= ${__X}cpp .if empty(.MAKEFLAGS:M-s) ECHO ?= echo @@ -117,7 +117,7 @@ LEX ?= lex LFLAGS ?= -LD ?= ld +LD ?= ${__X}ld LDFLAGS ?= LINT ?= lint @@ -129,6 +129,10 @@ MAKE ?= make +.if !defined(%POSIX) +NM ?= ${__X}nm +.endif + OBJC ?= cc OBJCFLAGS ?= ${OBJCINCLUDES} ${CFLAGS} -Wno-import