diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-08-25 04:07:10 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-08-25 04:07:10 +0400 |
| commit | f77cd636427e5f82f5560acecd40ad8e90183b75 (patch) | |
| tree | 7c78ecd05f5fb68e7a906635bd3e82ad4c7c741e /winsup/cygwin/Makefile.in | |
| parent | fa3c05930c812a553cba0ac7f2e90599a3b3c094 (diff) | |
* Makefile.in (DLL_IMPORTS): Move libuuid.a and libshell32.a to list rather
than referring to them via -l. Add DLL imports last in link line for
new-cygwin.dll and cygrun.exe.
Diffstat (limited to 'winsup/cygwin/Makefile.in')
| -rw-r--r-- | winsup/cygwin/Makefile.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index dbba11015..1d62664c5 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -115,7 +115,7 @@ EXTRA_OFILES=$(bupdir1)/libiberty/random.o $(bupdir1)/libiberty/strsignal.o MALLOC_OFILES=@MALLOC_OFILES@ -DLL_IMPORTS:=$(w32api_lib)/libkernel32.a +DLL_IMPORTS:=$(w32api_lib)/libuuid.a $(w32api_lib)/libshell32.a $(w32api_lib)/libkernel32.a # Please maintain this list in sorted order, with maximum files per 80 col line DLL_OFILES:=assert.o autoload.o cygheap.o cygserver_client.o \ @@ -154,7 +154,7 @@ EXTRALIBS:=libautomode.a libbinmode.a libtextmode.a INSTOBJS:=automode.o binmode.o textmode.o TARGET_LIBS:=$(LIB_NAME) $(SUBLIBS) $(GMON_START) $(LIBGMON_A) $(SUBLIBS) $(INSTOBJS) $(EXTRALIBS) .PHONY: all force dll_ofiles install all_target install_target all_host install_host \ - install install-libs install-headers + install install-libs install-headers -lgcc .SUFFIXES: .SUFFIXES: .c .cc .def .a .o .d @@ -254,8 +254,8 @@ maintainer-clean realclean: clean new-$(DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp $(CXX) $(CXXFLAGS) -nostdlib -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \ - $(DLL_IMPORTS) $(MALLOC_OBJ) $(LIBM) $(LIBC) \ - -lstdc++ -lgcc -lshell32 -luuid + $(MALLOC_OBJ) $(LIBM) $(LIBC) \ + -lstdc++ -lgcc $(DLL_IMPORTS) # Rule to build libcygwin.a $(LIB_NAME): rmsym newsym new-$(DLL_NAME) $(LIBCOS) @@ -314,9 +314,9 @@ winver_stamp: mkvers.sh include/cygwin/version.h winver.rc $(DLL_OFILES) malloc.o: malloc.cc $(COMPILE_CXX) -fomit-frame-pointer -o $@ $< -cygrun.exe : cygrun.o $(LIB_NAME) $(w32api_lib)/libuser32.a \ +cygrun.exe : cygrun.o -lgcc $(LIB_NAME) $(w32api_lib)/libuser32.a \ $(w32api_lib)/libshell32.a $(w32api_lib)/libkernel32.a - $(CC) -nodefaultlibs -o $@ $^ -lgcc -lcygwin + $(CC) -nodefaultlibs -o $@ $^ cygserver_transport_outside.o: cygserver_transport.cc $(COMPILE_CXX) -D__OUTSIDE_CYGWIN__ -o $@ $< @@ -342,6 +342,8 @@ cygserver.exe: cygserver.o cygserver_shm.o cygserver_transport_outside.o cygserv # $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) #endif +-lgcc: + # Makefile: cygwin.din |