Gitweb links:
...log
http://git.netsurf-browser.org/libpencil.git/shortlog/abac073196c8f570ca954bc639c205a329a0376d
...commit
http://git.netsurf-browser.org/libpencil.git/commit/abac073196c8f570ca954bc639c205a329a0376d
...tree
http://git.netsurf-browser.org/libpencil.git/tree/abac073196c8f570ca954bc639c205a329a0376d
The branch, master has been updated
via abac073196c8f570ca954bc639c205a329a0376d (commit)
from b8f47e07d069d480f8cd53926984b1d8fcf9aa31 (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/libpencil.git/commit/?id=abac073196c8f570ca954bc639c205a329a0376d
commit abac073196c8f570ca954bc639c205a329a0376d
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Tweak RISC OS host detection for new tooling.
The new toolchain has a different machine triplet, so update the
things that care about it to work either way.
Additionally, order of libraries on the linker command line is
actually enforced now, so ensure OSLib comes last.
diff --git a/Makefile b/Makefile
index 039c3e5..23c3519 100644
--- a/Makefile
+++ b/Makefile
@@ -29,15 +29,6 @@ else
CFLAGS := $(CFLAGS) -Dinline="__inline__"
endif
-# OSLib
-ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
- ifeq ($(HOST),arm-unknown-riscos)
- CFLAGS := $(CFLAGS) -I$(PREFIX)/include
- LDFLAGS := $(LDFLAGS) -lOSLib32
- TESTLDFLAGS := $(TESTLDFLAGS) -static
- endif
-endif
-
# RUfl
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
ifneq ($(PKGCONFIG),)
@@ -49,6 +40,15 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
endif
endif
+# OSLib
+ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
+ ifeq ($(findstring -riscos,$(HOST)),-riscos)
+ CFLAGS := $(CFLAGS) -I$(PREFIX)/include
+ LDFLAGS := $(LDFLAGS) -lOSLib32
+ TESTLDFLAGS := $(TESTLDFLAGS) -static
+ endif
+endif
+
include $(NSBUILD)/Makefile.top
# Extra installation rules
-----------------------------------------------------------------------
Summary of changes:
Makefile | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 039c3e5..23c3519 100644
--- a/Makefile
+++ b/Makefile
@@ -29,15 +29,6 @@ else
CFLAGS := $(CFLAGS) -Dinline="__inline__"
endif
-# OSLib
-ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
- ifeq ($(HOST),arm-unknown-riscos)
- CFLAGS := $(CFLAGS) -I$(PREFIX)/include
- LDFLAGS := $(LDFLAGS) -lOSLib32
- TESTLDFLAGS := $(TESTLDFLAGS) -static
- endif
-endif
-
# RUfl
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
ifneq ($(PKGCONFIG),)
@@ -49,6 +40,15 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
endif
endif
+# OSLib
+ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
+ ifeq ($(findstring -riscos,$(HOST)),-riscos)
+ CFLAGS := $(CFLAGS) -I$(PREFIX)/include
+ LDFLAGS := $(LDFLAGS) -lOSLib32
+ TESTLDFLAGS := $(TESTLDFLAGS) -static
+ endif
+endif
+
include $(NSBUILD)/Makefile.top
# Extra installation rules
--
RISC OS Drawfile export library
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
