summaryrefslogtreecommitdiffstats
path: root/contrib/libiconv
diff options
context:
space:
mode:
authormaxd <[email protected]>2017-07-24 16:24:49 +0200
committerBradley Sepos <[email protected]>2017-10-05 17:17:34 -0400
commitb13b37ef9b2b9a09d25d963a0c9ae759070568b7 (patch)
tree49e6528f1b5eaf960eebb20800f3ce3b840f3268 /contrib/libiconv
parent72b4ee71638ab2f0b658f3076119b3d28f41f177 (diff)
MSYS compilation on Windows and for Windows
Diffstat (limited to 'contrib/libiconv')
-rw-r--r--contrib/libiconv/module.defs10
1 files changed, 8 insertions, 2 deletions
diff --git a/contrib/libiconv/module.defs b/contrib/libiconv/module.defs
index 4b2d9fbac..9c645cc38 100644
--- a/contrib/libiconv/module.defs
+++ b/contrib/libiconv/module.defs
@@ -5,7 +5,13 @@ LIBICONV.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libicon
LIBICONV.FETCH.url += https://ftp.gnu.org/gnu/libiconv/libiconv-1.15.tar.gz
LIBICONV.FETCH.sha256 = ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
+ifeq (1,$(BUILD.cross))
# this contrib will not build under MinGW with -std=gnu99
-ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
- LIBICONV.GCC.args.c_std = -std=gnu89
+ ifeq (mingw,$(BUILD.system))
+ LIBICONV.GCC.args.c_std = -std=gnu89
+ endif
+
+ ifeq (msys,$(HOST.system))
+ LIBICONV.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu
+ endif
endif