Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/b1c99fe8dd3b1a424a1e4275c9f0df3adc4e589b
...commit
http://git.netsurf-browser.org/netsurf.git/commit/b1c99fe8dd3b1a424a1e4275c9f0df3adc4e589b
...tree
http://git.netsurf-browser.org/netsurf.git/tree/b1c99fe8dd3b1a424a1e4275c9f0df3adc4e589b
The branch, master has been updated
via b1c99fe8dd3b1a424a1e4275c9f0df3adc4e589b (commit)
from 364a062578b50c69e64809f77e55ee898f43d2b9 (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/commit/?id=b1c99fe8dd3b1a424a1e4275c9f0df3adc4e589b
commit b1c99fe8dd3b1a424a1e4275c9f0df3adc4e589b
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Windows: autodetect x86_64 toolchain
diff --git a/frontends/windows/Makefile.tools b/frontends/windows/Makefile.tools
index 24f0f7fbd..04550ba85 100644
--- a/frontends/windows/Makefile.tools
+++ b/frontends/windows/Makefile.tools
@@ -4,9 +4,25 @@
##
ifneq ($(HOST),windows)
- # Set Mingw defaults
- GCCSDK_INSTALL_ENV ?= /opt/netsurf/i686-w64-mingw32/env
- GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/i686-w64-mingw32/cross/bin
+ # Cross-build for Windows
+
+ # Search for the toolchain install locations if we haven't been told
+ # The search order prefers x86_64 over i686
+ ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
+ ifneq ($(realpath /opt/netsurf/x86_64-w64-mingw32/env),)
+ GCCSDK_INSTALL_ENV := /opt/netsurf/x86_64-w64-mingw32/env
+ else
+ GCCSDK_INSTALL_ENV := /opt/netsurf/i686-w64-mingw32/env
+ endif
+ endif
+
+ ifeq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined)
+ ifneq ($(realpath /opt/netsurf/x86_64-w64-mingw32/env),)
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/x86_64-w64-mingw32/cross/bin
+ else
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/i686-w64-mingw32/cross/bin
+ endif
+ endif
CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
WINDRES := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*windres)
-----------------------------------------------------------------------
Summary of changes:
frontends/windows/Makefile.tools | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/frontends/windows/Makefile.tools b/frontends/windows/Makefile.tools
index 24f0f7fbd..04550ba85 100644
--- a/frontends/windows/Makefile.tools
+++ b/frontends/windows/Makefile.tools
@@ -4,9 +4,25 @@
##
ifneq ($(HOST),windows)
- # Set Mingw defaults
- GCCSDK_INSTALL_ENV ?= /opt/netsurf/i686-w64-mingw32/env
- GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/i686-w64-mingw32/cross/bin
+ # Cross-build for Windows
+
+ # Search for the toolchain install locations if we haven't been told
+ # The search order prefers x86_64 over i686
+ ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
+ ifneq ($(realpath /opt/netsurf/x86_64-w64-mingw32/env),)
+ GCCSDK_INSTALL_ENV := /opt/netsurf/x86_64-w64-mingw32/env
+ else
+ GCCSDK_INSTALL_ENV := /opt/netsurf/i686-w64-mingw32/env
+ endif
+ endif
+
+ ifeq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined)
+ ifneq ($(realpath /opt/netsurf/x86_64-w64-mingw32/env),)
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/x86_64-w64-mingw32/cross/bin
+ else
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/i686-w64-mingw32/cross/bin
+ endif
+ endif
CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
WINDRES := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*windres)
--
NetSurf Browser
