Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/2b9a8d13c88a621cc094689082f48d1299ce9590
...commit
http://git.netsurf-browser.org/netsurf.git/commit/2b9a8d13c88a621cc094689082f48d1299ce9590
...tree
http://git.netsurf-browser.org/netsurf.git/tree/2b9a8d13c88a621cc094689082f48d1299ce9590
The branch, master has been updated
via 2b9a8d13c88a621cc094689082f48d1299ce9590 (commit)
from e461d9879b6859c6ca34b3512412f2dee3d36f4d (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/netsurf.git/commitdiff/2b9a8d13c88a621cc094689082f48d1299ce9590
commit 2b9a8d13c88a621cc094689082f48d1299ce9590
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
enable ccache where available
diff --git a/Makefile b/Makefile
index 087fa69..5cecd97 100644
--- a/Makefile
+++ b/Makefile
@@ -187,10 +187,6 @@ ifeq ($(TARGET),riscos)
EXEEXT := ,ff8
endif
PKG_CONFIG := $(GCCSDK_INSTALL_ENV)/ro-pkg-config
- CCACHE := $(shell which ccache)
- ifneq ($(CCACHE),)
- CC := $(CCACHE) $(CC)
- endif
endif
else
ifeq ($(TARGET),beos)
@@ -267,8 +263,14 @@ else
endif
endif
-# Target paths
+# CCACHE
+ifeq ($(origin CCACHE),undefined)
+ CCACHE=$(shell ccache -V >/dev/null 2>&1 && echo ccache || echo)
+endif
+CC := $(CCACHE) $(CC)
+
+# Target paths
OBJROOT = build-$(HOST)-$(TARGET)$(SUBTARGET)
DEPROOT := $(OBJROOT)/deps
TOOLROOT := $(OBJROOT)/tools
-----------------------------------------------------------------------
Summary of changes:
Makefile | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 087fa69..5cecd97 100644
--- a/Makefile
+++ b/Makefile
@@ -187,10 +187,6 @@ ifeq ($(TARGET),riscos)
EXEEXT := ,ff8
endif
PKG_CONFIG := $(GCCSDK_INSTALL_ENV)/ro-pkg-config
- CCACHE := $(shell which ccache)
- ifneq ($(CCACHE),)
- CC := $(CCACHE) $(CC)
- endif
endif
else
ifeq ($(TARGET),beos)
@@ -267,8 +263,14 @@ else
endif
endif
-# Target paths
+# CCACHE
+ifeq ($(origin CCACHE),undefined)
+ CCACHE=$(shell ccache -V >/dev/null 2>&1 && echo ccache || echo)
+endif
+CC := $(CCACHE) $(CC)
+
+# Target paths
OBJROOT = build-$(HOST)-$(TARGET)$(SUBTARGET)
DEPROOT := $(OBJROOT)/deps
TOOLROOT := $(OBJROOT)/tools
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
