From 478bb995fbe19378990974bedcf5d5582d7a49c3 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 24 Oct 2012 10:12:45 +0000 Subject: * Makefile.in (DLL_IMPORTS): Use system import libraries for kernel32 and ntdll instead of from in-tree w32api. (cygwin0.dll): Remove rule dependency on DLL_IMPORTS, as they are no longer built in-tree. --- winsup/cygwin/ChangeLog | 7 +++++++ winsup/cygwin/Makefile.in | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9a8c4380e..ac799bac0 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2012-10-24 Yaakov Selkowitz + + * Makefile.in (DLL_IMPORTS): Use system import libraries for + kernel32 and ntdll instead of from in-tree w32api. + (cygwin0.dll): Remove rule dependency on DLL_IMPORTS, as they + are no longer built in-tree. + 2012-10-23 Corinna Vinschen * thread.h (List_insert): Cast first parameter in diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 6e4282843..5e0042463 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -130,7 +130,7 @@ EXTRA_OFILES:= MALLOC_OFILES:=@MALLOC_OFILES@ -DLL_IMPORTS:=$(w32api_lib)/libkernel32.a $(w32api_lib)/libntdll.a +DLL_IMPORTS:=${shell $(CC) -print-file-name=w32api/libkernel32.a} ${shell $(CC) -print-file-name=w32api/libntdll.a} MT_SAFE_OBJECTS:= # @@ -395,7 +395,7 @@ maintainer-clean realclean: clean # Rule to build cygwin.dll -$(TEST_DLL_NAME): $(LDSCRIPT) dllfixdbg $(DLL_OFILES) $(DLL_IMPORTS) $(LIBSERVER) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp +$(TEST_DLL_NAME): $(LDSCRIPT) dllfixdbg $(DLL_OFILES) $(LIBSERVER) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp $(CXX) $(CXXFLAGS) -Wl,--gc-sections $(nostdlib) -Wl,-T$(firstword $^) -static \ -Wl,--heap=0 -Wl,--out-implib,cygdll.a -shared -o $@ \ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \ -- cgit v1.2.3