diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-05-31 09:40:16 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-05-31 09:40:16 +0000 |
| commit | bd06b34383c2ffab55b3ad7a3ccf136b9f0596ee (patch) | |
| tree | b069a6c5ebb108c55124f784452a4aa8d4da0bba /makefiles/Makefile.tools | |
| parent | be8fba73ee3841990b676c91e74da5a8d51d9a0e (diff) | |
| download | buildsystem-bd06b34383c2ffab55b3ad7a3ccf136b9f0596ee.tar.gz buildsystem-bd06b34383c2ffab55b3ad7a3ccf136b9f0596ee.tar.bz2 | |
Using ?= with defaulted variables is stupid
svn path=/trunk/tools/buildsystem/; revision=7661
Diffstat (limited to 'makefiles/Makefile.tools')
| -rw-r--r-- | makefiles/Makefile.tools | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index ae51c5c..4244163 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -88,7 +88,7 @@ ifeq ($(TARGET),riscos) GCCSDK_INSTALL_ENV ?= /home/riscos/env GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin - AR ?= $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar) + AR__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar) CC__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) CMHG ?= PATH="$(GCCSDK_INSTALL_CROSSBIN):$(PATH)" $(GCCSDK_INSTALL_CROSSBIN)/cmunge GENHTML ?= echo @@ -142,9 +142,9 @@ ifeq ($(TARGET),beos) endif endif -############################################################################## +############################################################################### # Tool defaults -############################################################################## +############################################################################### CP ?= cp @@ -257,7 +257,11 @@ ifneq ($(GCCVER),2) CC_CAN_BUILD_AND_DEP ?= yes endif -# Finally, set CC to the correct compiler +############################################################################### +# Finally, override defaulted tools +############################################################################### + +# CC ifeq ($(findstring ccc-analyzer,$(CC)),ccc-analyzer) # We're being invoked by scan-build, so export # the compiler we would have used such that @@ -278,3 +282,10 @@ else endif endif +# AR +ifeq ($(origin AR),default) + ifdef AR__ + AR := $(AR__) + endif +endif + |