aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-10-13 14:22:02 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-10-13 14:22:02 +0100
commit60962ff8eb2e2e99c73b72fb1c5cde404bec1043 (patch)
treed27a75b3856d85cdf98c26e1383bb4b6a704ec0e
parentea581aab772aaf676ec1546aed70619463a5613d (diff)
remake-merge-builds: Remove defunct w32 build config
Remove the old w32 config that used the old mingw toolchain. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rwxr-xr-xremake-merge-builds4
1 files changed, 0 insertions, 4 deletions
diff --git a/remake-merge-builds b/remake-merge-builds
index 27cf506..a30c7fd 100755
--- a/remake-merge-builds
+++ b/remake-merge-builds
@@ -25,10 +25,6 @@ do_conf all-linux-static '--cc=ccache gcc' '--enable-debug' '--static' '--disabl
do_conf all '--cc=ccache gcc'
do_conf alldbg '--cc=ccache gcc' '--enable-debug'
do_conf clang '--cc=clang' '--cxx=clang++' '--enable-gtk' '--extra-cflags=-fsanitize=undefined -Werror'
-# We have to put -Werror in the cflags by hand, because configure will ignore --enable-werror
-# because the compiler can't handle the GCC diagnostic-disabling pragmas. As it happens the w32
-# build doesn't encounter any of those so it's ok to override configure.
-do_conf w32 '--cross-prefix=i586-mingw32msvc-' '--extra-cflags=-I/home/petmay01/linaro/mingw/include -Werror' '--extra-ldflags=-L/home/petmay01/linaro/mingw/lib' '--enable-debug'
# -Wno-unused-local-typedefs is working around a problem with the glib version this
# toolchain is using where newer gcc gave a warning about its assert macro. Fixed