Skip to content
Snippets Groups Projects
Commit 03fad42e authored by Matthew Pickering's avatar Matthew Pickering Committed by Marge Bot
Browse files

configure: Set WindresCmd directly and removed unused variables

For some reason there was an indirection via the Windres variable before
setting WindresCmd. That indirection led to #23855.

I then also noticed that these other variables were just not used
anywhere when trying to work out what the correct condition was for this
bit of the configure script.
parent 7cbf9361
No related branches found
No related tags found
No related merge requests found
......@@ -357,28 +357,19 @@ else
AC_PATH_TOOL([AR],[ar])
AC_PATH_TOOL([RANLIB],[ranlib])
AC_PATH_TOOL([OBJDUMP],[objdump])
AC_PATH_TOOL([Windres],[windres])
AC_PATH_TOOL([WindresCmd],[windres])
AC_PATH_TOOL([Genlib],[genlib])
HAVE_GENLIB=False
if test "$HostOS" = "mingw32"; then
AC_CHECK_TARGET_TOOL([Windres],[windres])
AC_CHECK_TARGET_TOOL([WindresCmd],[windres])
AC_CHECK_TARGET_TOOL([OBJDUMP],[objdump])
if test "$Genlib" != ""; then
GenlibCmd="$(cygpath -m $Genlib)"
HAVE_GENLIB=True
fi
fi
fi
if test "$HostOS" = "mingw32"; then
WindresCmd="$Windres"
AC_SUBST([WindresCmd])
AC_SUBST([GenlibCmd])
AC_SUBST([HAVE_GENLIB])
fi
FP_ICONV
FP_GMP
FP_CURSES
......
......@@ -107,13 +107,6 @@ if test "$HostOS" = "mingw32" -a "$EnableDistroToolchain" = "NO"; then
FP_SETUP_WINDOWS_TOOLCHAIN([$hardtop/mingw/], [\$\$topdir/../mingw/])
fi
if test "$HostOS" = "mingw32"; then
WindresCmd="$Windres"
AC_SUBST([WindresCmd])
AC_SUBST([GenlibCmd])
AC_SUBST([HAVE_GENLIB])
fi
dnl ** Which gcc to use?
dnl --------------------------------------------------------------
AC_PROG_CC([gcc clang])
......
......@@ -132,7 +132,7 @@ AC_DEFUN([FP_SETUP_WINDOWS_TOOLCHAIN],[
RANLIB="${mingwbin}llvm-ranlib.exe"
OBJDUMP="${mingwbin}llvm-objdump.exe"
DLLTOOL="${mingwbin}llvm-dlltool.exe"
Windres="${mingwbin}llvm-windres.exe"
WindresCmd="${mingwbin}llvm-windres.exe"
# N.B. LLD does not support -r
MergeObjsCmd=""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment