Author: jmb Date: Mon Nov 9 14:24:59 2009 New Revision: 9672 URL: http://source.netsurf-browser.org?rev=9672&view=rev Log: If $(CC) is defaulted, use $(CC__) to determine EXEEXT. Default host tooling to cc/c++, rather than $(CC)/$(CXX) (which are the target toolchain) Modified: trunk/tools/buildsystem/makefiles/Makefile.tools Modified: trunk/tools/buildsystem/makefiles/Makefile.tools URL: http://source.netsurf-browser.org/trunk/tools/buildsystem/makefiles/Makef... ============================================================================== --- trunk/tools/buildsystem/makefiles/Makefile.tools (original) +++ trunk/tools/buildsystem/makefiles/Makefile.tools Mon Nov 9 14:24:59 2009 @@ -98,10 +98,18 @@ PKGCONFIG ?= $(GCCSDK_INSTALL_ENV)/ro-pkg-config ifneq ($(COMPONENT_TYPE),riscos-module) - ifneq ($(findstring arm-unknown-riscos-gcc,$(CC)),) - EXEEXT := ,e1f + ifeq ($(origin CC),default) + ifneq ($(findstring arm-unknown-riscos-gcc,$(CC__)),) + EXEEXT := ,e1f + else + EXEEXT := ,ff8 + endif else - EXEEXT := ,ff8 + ifneq ($(findstring arm-unknown-riscos-gcc,$(CC)),) + EXEEXT := ,e1f + else + EXEEXT := ,ff8 + endif endif else EXEEXT := ,ffa @@ -176,9 +184,9 @@ GENHTML ?= genhtml -HOST_CC ?= $(CC) - -HOST_CXX ?= $(CXX) +HOST_CC ?= cc + +HOST_CXX ?= c++ INSTALL ?= install