2012-10-21 Kai Tietz Yaakov Selkowitz * configure.in: Add check for MINGW_CXX. * configure: Regenerate. * Makefile.in: Remove references to mingw and w32api directories. Use MINGW_CXX instead of mingw script to build MINGW_BINS. * cygcheck.cc: Use relative include paths for Cygwin headers. * path.cc: Ditto. * strace.cc: Ditto * mingw: Remove. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/winsup/utils/Makefile.in,v retrieving revision 1.101 diff -u -p -r1.101 Makefile.in --- Makefile.in 19 Oct 2012 11:58:48 -0000 1.101 +++ Makefile.in 21 Oct 2012 19:50:10 -0000 @@ -40,15 +40,11 @@ include $(srcdir)/../Makefile.common .NOEXPORT: .PHONY: all install clean realclean warn_dumper warn_cygcheck_zlib -ALL_LDLIBS := -lnetapi32 -ladvapi32 -ALL_LDFLAGS := -static-libgcc -Wl,--enable-auto-import -B$(newlib_build)/libc -B$(w32api_lib) $(LDFLAGS) $(ALL_LDLIBS) -ALL_DEP_LDLIBS := $(cygwin_build)/libcygwin.a ${patsubst -l%,\ - $(w32api_lib)/lib%.a,$(ALL_LDLIBS) -lkernel32 -luser32} - -MINGW_LIB := $(mingw_build)/libmingw32.a -MINGW_LDLIBS := $(ALL_LDLIBS) $(MINGW_LIB) -MINGW_DEP_LDLIBS := $(ALL_DEP_LDLIBS) $(MINGW_LIB) -MINGW_CXX := ${srcdir}/mingw ${CXX} -I${updir} +ALL_LDLIBS := -lnetapi32 -ladvapi32 -lkernel32 -luser32 +ALL_LDFLAGS := -static-libgcc -Wl,--enable-auto-import -B$(newlib_build)/libc $(LDFLAGS) $(ALL_LDLIBS) +ALL_DEP_LDLIBS := $(cygwin_build)/libcygwin.a + +MINGW_CXX := @MINGW_CXX@ # List all binaries to be linked in Cygwin mode. Each binary on this list # must have a corresponding .o of the same name. @@ -74,7 +70,8 @@ path-mount.o: path.cc mount.exe: path-mount.o # Provide any necessary per-target variable overrides. -cygcheck.exe: MINGW_LDFLAGS += -B{w32api_lib} -lpsapi -lntdll -lmsvcrt +cygcheck.exe: MINGW_CXXFLAGS += -idirafter $(cygwin_source)/include -idirafter $(newlib_source)/libc/include +cygcheck.exe: MINGW_LDFLAGS += -lpsapi -lntdll cygpath.exe: ALL_LDFLAGS += -lcygwin -luserenv -lntdll cygpath.exe: CXXFLAGS += -fno-threadsafe-statics ps.exe: ALL_LDFLAGS += -lcygwin -lpsapi -lntdll @@ -83,7 +80,6 @@ strace.exe: MINGW_LDFLAGS += -lntdll ldd.exe: ALL_LDFLAGS += -lpsapi pldd.exe: ALL_LDFLAGS += -lpsapi -ldh.exe: MINGW_LDLIBS := ldh.exe: MINGW_LDFLAGS := -nostdlib -lkernel32 # Check for dumper's requirements and enable it if found. @@ -105,7 +101,7 @@ endif # Check for availability of a MinGW libz and enable for cygcheck. libz:=${shell x=$$(${MINGW_CXX} --print-file-name=libz.a); cd $$(dirname $$x); dir=$$(pwd); case "$$dir" in *mingw*) echo $$dir/libz.a ;; esac} ifdef libz -zlib_h := -include ${patsubst %/lib/mingw/libz.a,%/include/zlib.h,${patsubst %/lib/libz.a,%/include/zlib.h,$(libz)}} +zlib_h := -include ${patsubst %/lib/libz.a,%/include/zlib.h,$(libz)} zconf_h := ${patsubst %/zlib.h,%/zconf.h,$(zlib_h)} dump_setup.o: MINGW_CXXFLAGS += $(zconf_h) $(zlib_h) cygcheck.exe: MINGW_LDFLAGS += $(libz) @@ -160,7 +156,7 @@ endif # note: how to compile a Cygwin object is covered by the pattern rule in Makefile.common # these dependencies ensure that the required in-tree libs are built first -$(MINGW_BINS): $(MINGW_DEP_LDLIBS) +$(MINGW_BINS): $(ALL_DEP_LDLIBS) $(CYGWIN_BINS): $(ALL_DEP_LDLIBS) clean: @@ -179,9 +175,6 @@ install: all $(cygwin_build)/libcygwin.a: $(cygwin_build)/Makefile @$(MAKE) -C $(@D) $(@F) -$(MINGW_LIB): $(mingw_build)/Makefile - @$(MAKE) -C $(@D) $(@F) - warn_dumper: @echo '*** Not building dumper.exe since some required libraries or' @echo '*** or headers are missing. Potential candidates are:' Index: configure.in =================================================================== RCS file: /cvs/src/src/winsup/utils/configure.in,v retrieving revision 1.9 diff -u -p -r1.9 configure.in --- configure.in 25 Jul 2008 15:03:25 -0000 1.9 +++ configure.in 21 Oct 2012 19:50:11 -0000 @@ -27,5 +27,8 @@ INSTALL="/bin/sh "`cd $srcdir/../..; ech AC_PROG_INSTALL +AC_CHECK_PROGS(MINGW_CXX, ${target_cpu}-w64-mingw32-g++) +test -z "$MINGW_CXX" && AC_MSG_ERROR([no acceptable mingw g++ found in \$PATH]) + AC_EXEEXT AC_OUTPUT(Makefile) Index: cygcheck.cc =================================================================== RCS file: /cvs/src/src/winsup/utils/cygcheck.cc,v retrieving revision 1.135 diff -u -p -r1.135 cygcheck.cc --- cygcheck.cc 9 Oct 2012 12:47:40 -0000 1.135 +++ cygcheck.cc 21 Oct 2012 19:50:11 -0000 @@ -22,11 +22,10 @@ #include "path.h" #include "wide_path.h" #include -#include "cygwin/include/cygwin/version.h" -#include "cygwin/include/sys/cygwin.h" -#include "cygwin/include/mntent.h" -#include "cygwin/cygprops.h" -#include "cygwin/version.h" +#include "../cygwin/include/cygwin/version.h" +#include "../cygwin/include/sys/cygwin.h" +#include "../cygwin/include/mntent.h" +#include "../cygwin/cygprops.h" #undef cygwin_internal #include "loadlib.h" Index: path.cc =================================================================== RCS file: /cvs/src/src/winsup/utils/path.cc,v retrieving revision 1.31 diff -u -p -r1.31 path.cc --- path.cc 17 Dec 2011 23:39:47 -0000 1.31 +++ path.cc 21 Oct 2012 19:50:11 -0000 @@ -23,9 +23,9 @@ details. */ #include #include #include "path.h" -#include "cygwin/include/cygwin/version.h" -#include "cygwin/include/sys/mount.h" -#include "cygwin/include/mntent.h" +#include "../cygwin/include/cygwin/version.h" +#include "../cygwin/include/sys/mount.h" +#include "../cygwin/include/mntent.h" #include "testsuite.h" #ifdef FSTAB_ONLY #include Index: strace.cc =================================================================== RCS file: /cvs/src/src/winsup/utils/strace.cc,v retrieving revision 1.64 diff -u -p -r1.64 strace.cc --- strace.cc 11 Jul 2012 16:41:51 -0000 1.64 +++ strace.cc 21 Oct 2012 19:50:11 -0000 @@ -27,9 +27,9 @@ details. */ #include #include #include -#include "cygwin/include/sys/strace.h" -#include "cygwin/include/sys/cygwin.h" -#include "cygwin/include/cygwin/version.h" +#include "../cygwin/include/sys/strace.h" +#include "../cygwin/include/sys/cygwin.h" +#include "../cygwin/include/cygwin/version.h" #include "path.h" #undef cygwin_internal #include "loadlib.h"