diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-16 14:43:02 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-16 14:43:02 (GMT) |
| commit | 3dd24b804c90d0421a7200b2a2b04794887b95fa (patch) | |
| tree | de06d4db0198e50996bf48ab566847f80af904e8 /win/configure | |
| parent | 2ac3f2c3aa611ff302c7cb22beaa30275cc600f6 (diff) | |
| parent | 04d138c167f126414371d8702a819cdb63ace694 (diff) | |
| download | tk-3dd24b804c90d0421a7200b2a2b04794887b95fa.zip tk-3dd24b804c90d0421a7200b2a2b04794887b95fa.tar.gz tk-3dd24b804c90d0421a7200b2a2b04794887b95fa.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win/configure')
| -rwxr-xr-x | win/configure | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/win/configure b/win/configure index 33e23ac..af50495 100755 --- a/win/configure +++ b/win/configure @@ -4026,14 +4026,14 @@ $as_echo "$ac_cv_cross" >&6; } if test "$ac_cv_cross" = "yes"; then case "$do64bit" in amd64|x64|yes) - CC="x86_64-w64-mingw32-gcc" + CC="x86_64-w64-mingw32-${CC}" LD="x86_64-w64-mingw32-ld" AR="x86_64-w64-mingw32-ar" RANLIB="x86_64-w64-mingw32-ranlib" RC="x86_64-w64-mingw32-windres" ;; *) - CC="i686-w64-mingw32-gcc" + CC="i686-w64-mingw32-${CC}" LD="i686-w64-mingw32-ld" AR="i686-w64-mingw32-ar" RANLIB="i686-w64-mingw32-ranlib" @@ -4267,10 +4267,19 @@ $as_echo "using shared flags" >&6; } CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" - CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement -Wpointer-arith" + CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wpointer-arith" LDFLAGS_DEBUG= LDFLAGS_OPTIMIZE= + case "${CC}" in + *++) + CFLAGS_WARNING="${CFLAGS_WARNING} -Wno-format" + ;; + *) + CFLAGS_WARNING="${CFLAGS_WARNING} -Wdeclaration-after-statement" + ;; + esac + # Specify the CC output file names based on the target name CC_OBJNAME="-o \$@" CC_EXENAME="-o \$@" |