> > For consistency with the existing multilib dirs, IMHO LIBARM32SUFFIXDIR > should be lib only if hostcpu is arm*, it should be libarm32 otherwise.
Yes this makes sense so I changed it to that with this updated patch. Also when the host is arm x86 libs should also not be lib and should be libx8632 for consistency I added arm64 also for aarch64 for this also so that we have an example going forward for any arch and not run into this issue again. It is noted as armv7* else where in the code rather than arm* so I used that for consistency Please Review On Mon, Jun 15, 2015 at 11:28 PM, JonY <[email protected]> wrote: > On 6/14/2015 17:09, Kai Tietz wrote: > > Patches are IMO ok. André any concerns about the removal of the 'd' > > postfix on floating-point-constant? > > For consistency with the existing multilib dirs, IMHO LIBARM32SUFFIXDIR > should be lib only if hostcpu is arm*, it should be libarm32 otherwise. > > > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Mingw-w64-public mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/mingw-w64-public > >
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am index 8b91f0c..30cc247 100644 --- a/mingw-w64-crt/Makefile.am +++ b/mingw-w64-crt/Makefile.am @@ -395,7 +395,7 @@ if LIB32 # Compiling 32-bit runtime # -lib32dir=$(prefix)/@LIB32SUFFIXDIR@ +lib32dir=$(prefix)/@LIBX8632SUFFIXDIR@ crt32dir=$(lib32dir) winrt32dir=$(lib32dir) dx32dir=$(lib32dir) @@ -660,7 +660,7 @@ if LIB64 # Compiling 64-bit runtime # ####################################################################### -lib64dir=$(prefix)/@LIB64SUFFIXDIR@ +lib64dir=$(prefix)/@LIBX8664SUFFIXDIR@ crt64dir=$(lib64dir) winrt64dir=$(lib64dir) dx64dir=$(lib64dir) diff --git a/mingw-w64-crt/configure.ac b/mingw-w64-crt/configure.ac index bcf7d0c..788779c 100644 --- a/mingw-w64-crt/configure.ac +++ b/mingw-w64-crt/configure.ac @@ -121,23 +121,43 @@ AS_VAR_IF([enable_libarm32],[yes],[ AS_CASE([$host_cpu], [x86_64],[ - lib64suffx=lib - lib32suffx=lib32], + libx8664suffx=lib + libx8632suffx=lib32 + libarm64suffx=libarm64 + libarm32suffx=libarm32], [i*86],[ - lib64suffx=lib64 - lib32suffx=lib], + libx8664suffx=lib64 + libx8632suffx=lib + libarm64suffx=libarm64 + libarm32suffx=libarm32], + [aarch64*],[ + libx8664suffx=libx8664 + libx8632suffx=libx8632 + libarm64suffx=lib + libarm32suffx=lib32], + [armv7*],[ + libx8664suffx=libx8664 + libx8632suffx=libx8632 + libarm64suffx=lib64 + libarm32suffx=lib], [ - lib64suffx=lib64 - lib32suffx=lib32] + libx8664suffx=libx8664 + libx8632suffx=libx8632 + libarm64suffx=libarm64 + libarm32suffx=libarm32] ) AS_VAR_IF([enable_w32api],[yes],[ - lib64suffx=$lib64suffx/w32api - lib32suffx=$lib32suffx/w32api + libx8664suffx=$libx8664suffx/w32api + libx8632suffx=$libx8632suffx/w32api + libarm64suffx=$libarm64suffx/w32api + libarm32suffx=$libarm32suffx/w32api ]) -AC_SUBST([LIB64SUFFIXDIR],[$lib64suffx]) -AC_SUBST([LIB32SUFFIXDIR],[$lib32suffx]) +AC_SUBST([LIBX8664SUFFIXDIR],[$libx8664suffx]) +AC_SUBST([LIBX8632SUFFIXDIR],[$libx8632suffx]) +AC_SUBST([LIBARM64SUFFIXDIR],[$libarm64suffx]) +AC_SUBST([LIBARM32SUFFIXDIR],[$libarm32suffx]) # Checks for features.
------------------------------------------------------------------------------
_______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
