Gitweb links:
...log
http://git.netsurf-browser.org/buildsystem.git/shortlog/0005ae300283ff01c2e2b05e7376b3e55dea21f7
...commit
http://git.netsurf-browser.org/buildsystem.git/commit/0005ae300283ff01c2e2b05e7376b3e55dea21f7
...tree
http://git.netsurf-browser.org/buildsystem.git/tree/0005ae300283ff01c2e2b05e7376b3e55dea21f7
The branch, master has been updated
via 0005ae300283ff01c2e2b05e7376b3e55dea21f7 (commit)
from c81ec8a713550388fbb2a441fac05dfa27caa5ed (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/commit/?id=0005ae300283ff01c2e2b05e7376b3e55dea21f7
commit 0005ae300283ff01c2e2b05e7376b3e55dea21f7
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Makefile.tools: teach it about x86_64-w64-mingw32
This host can use the same rules as the i686 one.
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 1010e34..38a9deb 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -195,8 +195,8 @@ else
PREFIX ?= $(GCCSDK_INSTALL_ENV)
endif
- ifeq ($(HOST),i686-w64-mingw32)
- # Cross compiling for Windows -- assumes mingw toolchain
+ ifeq ($(findstring -mingw32,$(HOST)),-mingw32)
+ # Cross compiling for Windows using mingw toolchain (either i686 or x86_64)
GENHTML ?= echo
LCOV ?= echo
PKGCONFIG ?=
PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/share/pkgconfig"
pkg-config
-----------------------------------------------------------------------
Summary of changes:
makefiles/Makefile.tools | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 1010e34..38a9deb 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -195,8 +195,8 @@ else
PREFIX ?= $(GCCSDK_INSTALL_ENV)
endif
- ifeq ($(HOST),i686-w64-mingw32)
- # Cross compiling for Windows -- assumes mingw toolchain
+ ifeq ($(findstring -mingw32,$(HOST)),-mingw32)
+ # Cross compiling for Windows using mingw toolchain (either i686 or x86_64)
GENHTML ?= echo
LCOV ?= echo
PKGCONFIG ?=
PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/share/pkgconfig"
pkg-config
--
NetSurf Project build system
