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

* configure.in: w32api directory was already optional. Semi-revert 2003-02-06

Browse Source 
change.
* configure: Regenerate.
* Makefile.common: Don't specific -nostdinc if there is no w32api directory.
This commit is contained in:
Christopher Faylor
2003-03-17 22:27:07 +00:00
parent c51dc9c245
commit 237ab58c28
4 changed files with 28 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/ChangeLog
View File

@@ -1,3 +1,11 @@
2003-03-17 Christopher Faylor <cgf@redhat.com>
* configure.in: w32api directory was already optional. Semi-revert
2003-02-06 change.
* configure: Regenerate.
* Makefile.common: Don't specific -nostdinc if there is no w32api
directory.
2003-03-09 Christopher Faylor <cgf@redhat.com>
* Makefile.common: Avoid double slashes in GCC_INCLUDE.

6
winsup/Makefile.common
View File

@@ -118,9 +118,11 @@ ifeq (,${findstring $(gcc_libdir),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
GCC_INCLUDE:=${subst //,/,-I$(gcc_libdir)/include}
endif
COMPILE_CXX=$(CXX) $c -nostdinc++ -nostdinc $(ALL_CXXFLAGS) $(GCC_INCLUDE) \
nostdinc:=${shell [ -d "$$srcdir/w32api" ] && echo "-nostdinc -nostdinc++"]}
COMPILE_CXX=$(CXX) $c $(nostdinc) $(ALL_CXXFLAGS) $(GCC_INCLUDE) \
-fno-rtti -fno-exceptions
COMPILE_CC=$(CC) $c -nostdinc $(ALL_CFLAGS) $(GCC_INCLUDE)
COMPILE_CC=$(CC) $c $(nostdinc) $(ALL_CFLAGS) $(GCC_INCLUDE)
vpath %.a $(cygwin_build):$(w32api_lib):$(newlib_build)/libc:$(newlib_build)/libm

46
winsup/configure vendored
View File

@@ -916,14 +916,13 @@ fi
CXXFLAGS='$(CFLAGS)'
SUBDIRS='cygwin'
SUBDIRS='cygwin w32api'
test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
test -d $srcdir/w32api && SUBDIRS="w32api $SUBDIRS"
case "$with_cross_host" in
""|*cygwin*)
test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
# test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
# test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
# test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
SUBDIRS="$SUBDIRS utils doc"
;;
@@ -933,7 +932,7 @@ subdirs="$SUBDIRS"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:937: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:936: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1027,34 +1026,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
#
# If the first sed substitution is executed (which looks for macros that
# take arguments), then we branch to the quote section. Otherwise,
# look for a macro that doesn't take arguments.
cat >confdef2opt.sed <<\_ACEOF
t clear
: clear
s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
t quote
s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
t quote
d
: quote
s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
s,\[,\\&,g
s,\],\\&,g
s,\$,$$,g
p
_ACEOF
# We use echo to avoid assuming a particular line-breaking character.
# The extra dot is to prevent the shell from consuming trailing
# line-breaks from the sub-command output. A line-break within
# single-quotes doesn't work because, if this script is created in a
# platform that uses two characters for line-breaks (e.g., DOS), tr
# would break.
ac_LF_and_DOT=`echo; echo .`
DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
rm -f confdef2opt.sed
cat > conftest.defs <<\EOF
s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
s%\[%\\&%g
s%\]%\\&%g
s%\$%$$%g
EOF
DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
rm -f conftest.defs
# Without the "./", some shells look in PATH for config.status.

7
winsup/configure.in
View File

@@ -66,14 +66,13 @@ AC_CANONICAL_SYSTEM
LIB_AC_PROG_CC
LIB_AC_PROG_CXX
SUBDIRS='cygwin'
SUBDIRS='cygwin w32api'
test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
test -d $srcdir/w32api && SUBDIRS="w32api $SUBDIRS"
case "$with_cross_host" in
""|*cygwin*)
test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
# test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
# test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
# test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
SUBDIRS="$SUBDIRS utils doc"
;;