Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/7c5f9ed8cd029dda34b61...
...commit
http://git.netsurf-browser.org/netsurf.git/commit/7c5f9ed8cd029dda34b6167...
...tree
http://git.netsurf-browser.org/netsurf.git/tree/7c5f9ed8cd029dda34b616752...
The branch, master has been updated
via 7c5f9ed8cd029dda34b6167520d6b65fbc40fc69 (commit)
from 44487224252ad91c448373cd1974f1ef6c53579f (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/7c5f9ed8cd029dda34b...
commit 7c5f9ed8cd029dda34b6167520d6b65fbc40fc69
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
make the Make rules for compiler versioning be more portable with fewer shell calls
diff --git a/Makefile b/Makefile
index 1f83cba..2d61411 100644
--- a/Makefile
+++ b/Makefile
@@ -283,8 +283,9 @@ else
endif
# compiler versioning to adjust warning flags
-CC_MAJOR := $(shell $(CC) -dumpversion | cut -f1 -d. )
-CC_MINOR := $(shell $(CC) -dumpversion | cut -f2 -d. )
+CC_VERSION := $(shell $(CC) -dumpversion)
+CC_MAJOR := $(word 1,$(subst ., ,$(CC_VERSION)))
+CC_MINOR := $(word 2,$(subst ., ,$(CC_VERSION)))
define cc_ver_ge
$(shell expr $(CC_MAJOR) \>= $(1) \& $(CC_MINOR) \>= $(2))
endef
-----------------------------------------------------------------------
Summary of changes:
Makefile | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 1f83cba..2d61411 100644
--- a/Makefile
+++ b/Makefile
@@ -283,8 +283,9 @@ else
endif
# compiler versioning to adjust warning flags
-CC_MAJOR := $(shell $(CC) -dumpversion | cut -f1 -d. )
-CC_MINOR := $(shell $(CC) -dumpversion | cut -f2 -d. )
+CC_VERSION := $(shell $(CC) -dumpversion)
+CC_MAJOR := $(word 1,$(subst ., ,$(CC_VERSION)))
+CC_MINOR := $(word 2,$(subst ., ,$(CC_VERSION)))
define cc_ver_ge
$(shell expr $(CC_MAJOR) \>= $(1) \& $(CC_MINOR) \>= $(2))
endef
--
NetSurf Browser