summaryrefslogtreecommitdiff
path: root/makefiles/Makefile.tools
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-11-09 20:24:59 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-11-09 20:24:59 +0000
commitef248bcce8092635c2aa2f8736bc97521fdf0266 (patch)
tree96a0ebd328b23381532bce112d92df0515889b41 /makefiles/Makefile.tools
parentaf41ba2a98405155b33eb90cb9151b3aa328589c (diff)
downloadbuildsystem-ef248bcce8092635c2aa2f8736bc97521fdf0266.tar.gz
buildsystem-ef248bcce8092635c2aa2f8736bc97521fdf0266.tar.bz2
If $(CC) is defaulted, use $(CC__) to determine EXEEXT.
Default host tooling to cc/c++, rather than $(CC)/$(CXX) (which are the target toolchain) svn path=/trunk/tools/buildsystem/; revision=9672
Diffstat (limited to 'makefiles/Makefile.tools')
-rw-r--r--makefiles/Makefile.tools18
1 files changed, 13 insertions, 5 deletions
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index ebe25e7..af70003 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -98,10 +98,18 @@ ifeq ($(TARGET),riscos)
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 @@ ECHO ?= echo
GENHTML ?= genhtml
-HOST_CC ?= $(CC)
+HOST_CC ?= cc
-HOST_CXX ?= $(CXX)
+HOST_CXX ?= c++
INSTALL ?= install