JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makefile.in (MINGW_CXX): Define and use for mingw-compiled files. 

* path.cc: Include more path info in cygwin-specific includes since the cygwin
directory is no longer included by default.
This commit is contained in:
Christopher Faylor 2003-09-11 02:00:42 +00:00
parent 704d8c321e
commit b07b167eec
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/utils/ChangeLog
View File

@ -1,3 +1,9 @@
2003-09-10 Christopher Faylor <cgf@redhat.com>
* Makefile.in (MINGW_CXX): Define and use for mingw-compiled files.
* path.cc: Include more path info in cygwin-specific includes since the
cygwin directory is no longer included by default.
2003-09-10 Christopher Faylor <cgf@redhat.com> 2003-09-10 Christopher Faylor <cgf@redhat.com>
* Makefile.in: More fixups to adjust for the fact that mingw_getopt.o * Makefile.in: More fixups to adjust for the fact that mingw_getopt.o

21
winsup/utils/Makefile.in
View File

@ -66,10 +66,11 @@ ALL_LDLIBS:=${patsubst $(w32api_lib)/lib%.a,-l%,\
LIBICONV:=@libiconv@ LIBICONV:=@libiconv@
MINGW_LIB:=$(mingw_build)/libmingw32.a MINGW_LIB:=$(mingw_build)/libmingw32.a
DUMPER_LIB:=${libbfd} ${libintl} -L$(bupdir1)/libiberty $(LIBICONV) -liberty DUMPER_LIB:=${libbfd} ${libintl} -L$(bupdir1)/libiberty $(LIBICONV) -liberty
MINGW_LDLIBS:=$(ALL_LDLIBS) $(MINGW_LIB) MINGW_LDLIBS:=${filter-out $(libcygwin),$(ALL_LDLIBS) $(MINGW_LIB)}
MINGW_DEP_LDLIBS:=${ALL_DEP_LDLIBS} ${MINGW_LIB} MINGW_DEP_LDLIBS:=${ALL_DEP_LDLIBS} ${MINGW_LIB}
ALL_LDFLAGS:=-B$(newlib_build)/libc -B$(w32api_lib) $(LDFLAGS) $(ALL_LDLIBS) ALL_LDFLAGS:=-B$(newlib_build)/libc -B$(w32api_lib) $(LDFLAGS) $(ALL_LDLIBS)
DUMPER_LDFLAGS:=$(ALL_LDFLAGS) $(DUMPER_LIB) DUMPER_LDFLAGS:=$(ALL_LDFLAGS) $(DUMPER_LIB)
MINGW_CXX:=${patsubst %/cygwin/include,%/mingw/include,${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)}} -I$(updir)
PROGS:= cygcheck.exe cygpath.exe getfacl.exe kill.exe mkgroup.exe \ PROGS:= cygcheck.exe cygpath.exe getfacl.exe kill.exe mkgroup.exe \
mkpasswd.exe mount.exe passwd.exe ps.exe regtool.exe setfacl.exe \ mkpasswd.exe mount.exe passwd.exe ps.exe regtool.exe setfacl.exe \
@ -135,18 +136,18 @@ endif
path.o: path.cc path.o: path.cc
ifdef VERBOSE ifdef VERBOSE
${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $<
else else
@echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ @echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\
${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< ${MINGW_CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $<
endif endif
dump_setup.o: dump_setup.cc dump_setup.o: dump_setup.cc
ifdef VERBOSE ifdef VERBOSE
${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< $(MINGW_CXX) $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $<
else else
@echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ @echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\
${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< $(MINGW_CXX) $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $<
endif endif
cygcheck.o: cygcheck.cc cygcheck.o: cygcheck.cc
@ -159,10 +160,10 @@ endif
strace.o: strace.cc strace.o: strace.cc
ifdef VERBOSE ifdef VERBOSE
${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $<
else else
@echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ @echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\
${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $<
endif endif
kill.exe: kill.o $(bupdir1)/libiberty/strsignal.o kill.exe: kill.o $(bupdir1)/libiberty/strsignal.o

8
winsup/utils/path.cc
View File

@ -12,12 +12,14 @@ details. */
Cygwin's mount table. If the format or location of the mount table Cygwin's mount table. If the format or location of the mount table
changes, this is the file to change to match it. */ changes, this is the file to change to match it. */
#define str(a) #a
#define scat(a,b) str(a##b)
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <cygwin/version.h> #include "cygwin/include/cygwin/version.h"
#include <sys/mount.h> #include "cygwin/include/sys/mount.h"
#include <mntent.h> #include "cygwin/include/mntent.h"
/* Used when treating / and \ as equivalent. */ /* Used when treating / and \ as equivalent. */
#define SLASH_P(ch) \ #define SLASH_P(ch) \