Release: Evaluate MinGW sysroot path dynamically

anthony-kolesov · anthony-kolesov · commit 95bd29611ab1 · 2017-02-21T16:49:19.000+03:00
DLL files should be copied from MinGW sysroot folder. Path to this folder
used to be hardcoded, and that stopped working with MinGW toolchain at
non-standard location. Solution is to use gcc option `-print-sysroot` to
evaluate path dynamically.

Signed-off-by: Anton Kolesov &lt;Anton.Kolesov@synopsys.com&gt;
diff --git a/release.mk b/release.mk
@@ -567,7 +567,7 @@ $O/.stamp_linux_be_hs_tarball: $O/.stamp_linux_be_hs_built
 # Windows build
 #
 
-WINDOWS_SYSROOT := /usr/$(WINDOWS_TRIPLET)/sys-root/mingw
+WINDOWS_SYSROOT := $(shell $(WINDOWS_TRIPLET)-gcc -print-sysroot)/mingw
 
 # Helper function to copy mingw .dll files to installation directories with
 # executable files. There are several directories and for simplicity all .dlls

Original file line number	Diff line number	Diff line change
`@@ -567,7 +567,7 @@ $O/.stamp_linux_be_hs_tarball: $O/.stamp_linux_be_hs_built`
`567`	`567`	`# Windows build`
`568`	`568`	`#`
`569`	`569`
`570`		`-WINDOWS_SYSROOT := /usr/$(WINDOWS_TRIPLET)/sys-root/mingw`
	`570`	`+WINDOWS_SYSROOT := $(shell $(WINDOWS_TRIPLET)-gcc -print-sysroot)/mingw`
`571`	`571`
`572`	`572`	`# Helper function to copy mingw .dll files to installation directories with`
`573`	`573`	`# executable files. There are several directories and for simplicity all .dlls`