diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-04-27 08:54:57 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-04-27 08:57:06 +0000 |
| commit | 895f3c08affbc3cad443d3344aa97e068a6f904e (patch) | |
| tree | c48b7c2efc66f55e9fd32a1e8f272750be466e20 | |
| parent | 2085ac0cecc314f104213bdf0fe3ee9efca42699 (diff) | |
Follow up fix for --with-system-zlib=no handling.linaro/gcc-5-branchlinaro-local/gcc-5-integration-branch
Change-Id: I4e8b179e2a2c68ffb9e6d3a2e35fee71618f9f5b
| -rwxr-xr-x | gcc/configure | 6 | ||||
| -rw-r--r-- | gcc/configure.ac | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gcc/configure b/gcc/configure index d91fde1e7b1..ca5f39544df 100755 --- a/gcc/configure +++ b/gcc/configure @@ -28041,8 +28041,10 @@ zlibinc="-I\$(srcdir)/../zlib" # Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; zlibdir= -zlibinc= + withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= +fi fi diff --git a/gcc/configure.ac b/gcc/configure.ac index e9d10a97ac6..a0ec44b3af6 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -5435,8 +5435,10 @@ zlibdir=-L../zlib zlibinc="-I\$(srcdir)/../zlib" AC_ARG_WITH(system-zlib, [AS_HELP_STRING([--with-system-zlib], [use installed libz])], -zlibdir= -zlibinc= +if test x$with_system_zlib = xyes ; then + zlibdir= + zlibinc= +fi ) AC_SUBST(zlibdir) AC_SUBST(zlibinc) |