From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Tue, 14 Feb 2017 15:05:53 +0000 (+0100)
Subject: Fix 32bit compilation on x86_64 platform
X-Git-Tag: 1.9.9-b1~679
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d48f255b433cb29b2aa46d8ef069621c8872f66b;p=thirdparty%2Fzlib-ng.git

Fix 32bit compilation on x86_64 platform
---

diff --git a/configure b/configure
index 3b525681d..8e68b7faf 100755
--- a/configure
+++ b/configure
@@ -210,8 +210,19 @@ case `$cc -v 2>&1` in
   *clang*) gcc=1 ;;
 esac
 
+if test $build32 -eq 1; then
+  CFLAGS="${CFLAGS} -m32"
+  SFLAGS="${SFLAGS} -m32"
+  LDFLAGS="${LDFLAGS} -m32"
+fi
+if test $build64 -eq 1; then
+  CFLAGS="${CFLAGS} -m64"
+  SFLAGS="${SFLAGS} -m64"
+  LDFLAGS="${LDFLAGS} -m64"
+fi
+
 show $cc -c $test.c
-if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
+if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then
   echo ... using gcc >> configure.log
   CC="$cc"
 # Re-check arch if gcc is a cross-compiler
@@ -237,10 +248,6 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
   fi
   CFLAGS="${CFLAGS} -Wall"
   SFLAGS="${CFLAGS--O3} -fPIC"
-  if test $build64 -eq 1; then
-    CFLAGS="${CFLAGS} -m64"
-    SFLAGS="${SFLAGS} -m64"
-  fi
   if test $native -eq 1; then
     CFLAGS="${CFLAGS} -march=native"
     SFLAGS="${SFLAGS} -march=native"
@@ -926,6 +933,7 @@ sed < $SRCDIR/$ARCHDIR/Makefile.in "
 /^CC *=/s#=.*#=$CC#
 /^CFLAGS *=/s#=.*#=$CFLAGS#
 /^SFLAGS *=/s#=.*#=$SFLAGS#
+/^LDFLAGS *=/s#=.*#=$LDFLAGS#
 /^INCLUDES *=/s#=.*#=$ARCHINCLUDES#
 /^SRCDIR *=/s#=.*#=$SRCDIR/$ARCHDIR#
 /^SRCTOP *=/s#=.*#=$SRCDIR#
@@ -943,6 +951,7 @@ if test $compat -eq 1; then COMPATTESTS="compattests"; fi
 sed < $SRCDIR/test/Makefile.in "
 /^CC *=/s#=.*#=$CC#
 /^CFLAGS *=/s#=.*#=$CFLAGS#
+/^LDFLAGS *=/s#=.*#=$LDFLAGS#
 /^EXE *=/s#=.*#=$EXE#
 /^oldtests: */s#:.*#: $TEST#
 /^INCLUDES *=/s#=.*#=$TESTINCLUDES#
@@ -955,6 +964,7 @@ sed < $SRCDIR/test/Makefile.in "
 sed < $SRCDIR/zlib.pc.in "
 /^CC *=/s#=.*#=$CC#
 /^CFLAGS *=/s#=.*#=$CFLAGS#
+/^LDFLAGS *=/s#=.*#=$LDFLAGS#
 /^LDSHARED *=/s#=.*#=$LDSHARED#
 /^LDSHAREDFLAGS *=/s#=.*#=$LDSHAREDFLAGS#
 /^STATICLIB *=/s#=.*#=$STATICLIB#