This is the mail archive of the
cygwin-patches
mailing list for the Cygwin project.
[PATCH 64bit] lsaauth: skip 32bit DLL on 64bit target, part 2
- From: Yaakov (Cygwin/X) <yselkowitz at users dot sourceforge dot net>
- To: cygwin-patches at cygwin dot com
- Date: Wed, 20 Feb 2013 23:15:48 -0600
- Subject: [PATCH 64bit] lsaauth: skip 32bit DLL on 64bit target, part 2
The attached patch is a follow-up to my previous lsaauth patch. FWIW,
it worked as intended only because the toplevel Makefile provided
target_alias; this fixes make in the subdir.
Yaakov
2013-02-21 Yaakov Selkowitz <yselkowitz@...>
* Makefile.in (target_alias): Define for previous commit.
* configure.in: Skip check for i686-w64-mingw32-g++ on x86_64.
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/winsup/lsaauth/Makefile.in,v
retrieving revision 1.6.2.3
diff -u -p -r1.6.2.3 Makefile.in
--- Makefile.in 15 Feb 2013 10:42:16 -0000 1.6.2.3
+++ Makefile.in 21 Feb 2013 03:55:54 -0000
@@ -28,6 +28,7 @@ INSTALL_DATA := @INSTALL_DATA@
CC := @CC@
CC_FOR_TARGET := $(CC)
+target_alias := @target_alias@
MINGW32_CC := @MINGW32_CC@
MINGW64_CC := @MINGW64_CC@
Index: configure.ac
===================================================================
RCS file: /cvs/src/src/winsup/lsaauth/configure.ac,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 configure.ac
--- configure.ac 27 Nov 2012 08:56:07 -0000 1.1.2.1
+++ configure.ac 21 Feb 2013 03:55:54 -0000
@@ -25,10 +25,14 @@ AC_CANONICAL_SYSTEM
LIB_AC_PROG_CC
-AC_CHECK_PROGS(MINGW32_CC, i686-w64-mingw32-gcc)
-AC_CHECK_PROGS(MINGW64_CC, x86_64-w64-mingw32-gcc)
+case "$target_cpu" in
+i?86)
+ AC_CHECK_PROGS(MINGW32_CC, i686-w64-mingw32-gcc)
+ test -z "$MINGW32_CC" && AC_MSG_ERROR([no acceptable mingw32 cc found in \$PATH])
+ ;;
+esac
-test -z "$MINGW32_CC" && AC_MSG_ERROR([no acceptable mingw32 cc found in \$PATH])
+AC_CHECK_PROGS(MINGW64_CC, x86_64-w64-mingw32-gcc)
test -z "$MINGW64_CC" && AC_MSG_ERROR([no acceptable mingw64 cc found in \$PATH])
AC_ARG_PROGRAM