* 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.
This commit is contained in:
parent
68157644d1
commit
478bb995fb
|
@ -1,3 +1,10 @@
|
||||||
|
2012-10-24 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
|
||||||
|
|
||||||
|
* 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 <corinna@vinschen.de>
|
2012-10-23 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
* thread.h (List_insert): Cast first parameter in
|
* thread.h (List_insert): Cast first parameter in
|
||||||
|
|
|
@ -130,7 +130,7 @@ EXTRA_OFILES:=
|
||||||
|
|
||||||
MALLOC_OFILES:=@MALLOC_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:=
|
MT_SAFE_OBJECTS:=
|
||||||
#
|
#
|
||||||
|
@ -395,7 +395,7 @@ maintainer-clean realclean: clean
|
||||||
|
|
||||||
|
|
||||||
# Rule to build cygwin.dll
|
# 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 \
|
$(CXX) $(CXXFLAGS) -Wl,--gc-sections $(nostdlib) -Wl,-T$(firstword $^) -static \
|
||||||
-Wl,--heap=0 -Wl,--out-implib,cygdll.a -shared -o $@ \
|
-Wl,--heap=0 -Wl,--out-implib,cygdll.a -shared -o $@ \
|
||||||
-e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \
|
-e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \
|
||||||
|
|
Loading…
Reference in New Issue