Gitweb links:
...log
http://git.netsurf-browser.org/buildsystem.git/shortlog/d5be8343bd556d1a0c722cae9bb5b575f0f8c84e
...commit
http://git.netsurf-browser.org/buildsystem.git/commit/d5be8343bd556d1a0c722cae9bb5b575f0f8c84e
...tree
http://git.netsurf-browser.org/buildsystem.git/tree/d5be8343bd556d1a0c722cae9bb5b575f0f8c84e
The branch, master has been updated
via d5be8343bd556d1a0c722cae9bb5b575f0f8c84e (commit)
from d860ac0dcaa3d0cf6f0c48c054938478ccc216f6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/buildsystem.git/commitdiff/d5be8343bd556d1a0c722cae9bb5b575f0f8c84e
commit d5be8343bd556d1a0c722cae9bb5b575f0f8c84e
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
add ccache support
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index cbef0b8..2f0ca05 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -315,7 +315,7 @@ ifeq ($(TARGET),atari)
# Cross compiling for FreeMiNT
ATARIARCH ?= 68020-60
-
+
GCCSDK_INSTALL_ENV ?= /opt/netsurf/m68k-atari-mint/env
GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/m68k-atari-mint/cross/bin
CC__ := $(GCCSDK_INSTALL_CROSSBIN)/m68k-atari-mint-gcc
@@ -397,6 +397,11 @@ XSLTPROC ?= xsltproc
# Override defaulted tools
###############################################################################
+# CCACHE
+ifeq ($(origin CCACHE),undefined)
+ CCACHE=$(shell ccache -V >/dev/null 2>&1 && echo ccache || echo)
+endif
+
# CC
ifeq ($(findstring ccc-analyzer,$(CC)),ccc-analyzer)
# We're being invoked by scan-build, so export
@@ -413,7 +418,9 @@ else
# Otherwise, leave it to be defaulted.
ifeq ($(origin CC),default)
ifdef CC__
- CC := $(CC__)
+ CC := $(CCACHE) $(CC__)
+ else
+ CC := $(CCACHE) $(CC)
endif
endif
endif
@@ -421,7 +428,9 @@ endif
# CXX
ifeq ($(origin CXX),default)
ifdef CXX__
- CXX := $(CXX__)
+ CXX := $(CCACHE) $(CXX__)
+ else
+ CXX := $(CCACHE) $(CXX)
endif
endif
-----------------------------------------------------------------------
Summary of changes:
makefiles/Makefile.tools | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index cbef0b8..2f0ca05 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -315,7 +315,7 @@ ifeq ($(TARGET),atari)
# Cross compiling for FreeMiNT
ATARIARCH ?= 68020-60
-
+
GCCSDK_INSTALL_ENV ?= /opt/netsurf/m68k-atari-mint/env
GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/m68k-atari-mint/cross/bin
CC__ := $(GCCSDK_INSTALL_CROSSBIN)/m68k-atari-mint-gcc
@@ -397,6 +397,11 @@ XSLTPROC ?= xsltproc
# Override defaulted tools
###############################################################################
+# CCACHE
+ifeq ($(origin CCACHE),undefined)
+ CCACHE=$(shell ccache -V >/dev/null 2>&1 && echo ccache || echo)
+endif
+
# CC
ifeq ($(findstring ccc-analyzer,$(CC)),ccc-analyzer)
# We're being invoked by scan-build, so export
@@ -413,7 +418,9 @@ else
# Otherwise, leave it to be defaulted.
ifeq ($(origin CC),default)
ifdef CC__
- CC := $(CC__)
+ CC := $(CCACHE) $(CC__)
+ else
+ CC := $(CCACHE) $(CC)
endif
endif
endif
@@ -421,7 +428,9 @@ endif
# CXX
ifeq ($(origin CXX),default)
ifdef CXX__
- CXX := $(CXX__)
+ CXX := $(CCACHE) $(CXX__)
+ else
+ CXX := $(CCACHE) $(CXX)
endif
endif
--
NetSurf Project build system
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
