Gitweb links:
...log
http://git.netsurf-browser.org/makerun.git/shortlog/3fe86945effb26bc695ce...
...commit
http://git.netsurf-browser.org/makerun.git/commit/3fe86945effb26bc695ce60...
...tree
http://git.netsurf-browser.org/makerun.git/tree/3fe86945effb26bc695ce60bb...
The branch, master has been updated
via 3fe86945effb26bc695ce60bb766bb1524df41d9 (commit)
from abdbd16aed11a024d88920b3ad42b62db7e90ddd (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/makerun.git/commit/?id=3fe86945effb26bc695...
commit 3fe86945effb26bc695ce60bb766bb1524df41d9
Author: John-Mark Bell <jmb(a)netsurf-browser.org>
Commit: John-Mark Bell <jmb(a)netsurf-browser.org>
Update buildsystem for new RISC OS tooling
If cross-compiling for RISC OS, ensure we correctly detect the
new toolchain.
diff --git a/Makefile b/Makefile
index b69eadf..a0a07c4 100644
--- a/Makefile
+++ b/Makefile
@@ -44,8 +44,13 @@ ifeq ($(TARGET),riscos)
EXEEXT := ,e1f
SUBTARGET := -elf-
else
- EXEEXT := ,ff8
- SUBTARGET := -aof-
+ ifneq (,$(findstring arm-riscos-gnueabihf-gcc,$(CC)))
+ EXEEXT := ,e1f
+ SUBTARGET := -elfeabi-
+ else
+ EXEEXT := ,ff8
+ SUBTARGET := -aof-
+ endif
endif
endif
-----------------------------------------------------------------------
Summary of changes:
Makefile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index b69eadf..a0a07c4 100644
--- a/Makefile
+++ b/Makefile
@@ -44,8 +44,13 @@ ifeq ($(TARGET),riscos)
EXEEXT := ,e1f
SUBTARGET := -elf-
else
- EXEEXT := ,ff8
- SUBTARGET := -aof-
+ ifneq (,$(findstring arm-riscos-gnueabihf-gcc,$(CC)))
+ EXEEXT := ,e1f
+ SUBTARGET := -elfeabi-
+ else
+ EXEEXT := ,ff8
+ SUBTARGET := -aof-
+ endif
endif
endif
--
WimpSlot calculator for NetSurf