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

2012-10-24 Kai Tietz <ktietz70@googlemail.com>

Browse Source 
Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
	    Corinna Vinschen  <corinna@vinschen.de>

	* configure.in [cygwin*]: Always build cygserver, lsaauth,
	utils, and doc.  Do not build mingw or w32api.
	[mingw*]: Build w32api if present.
	* configure: Regenerate.
	* Makefile.common: Remove references to mingw and w32api
	directories.
	(MINGW_LDFLAGS): Redefine as -static to force static linking
	with libgcc and libstdc++.
	* Makefile.in: Remove references to mingw and w32api directories
	from Cygwin targets.
This commit is contained in:
Yaakov Selkowitz 2012-10-24 10:11:15 +00:00
parent 02fbb3bb59
commit 68157644d1
5 changed files with 252 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
winsup/ChangeLog
View File

@ -1,3 +1,18 @@
2012-10-24 Kai Tietz <ktietz70@googlemail.com>
Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Corinna Vinschen <corinna@vinschen.de>
* configure.in [cygwin*]: Always build cygserver, lsaauth,
utils, and doc. Do not build mingw or w32api.
[mingw*]: Build w32api if present.
* configure: Regenerate.
* Makefile.common: Remove references to mingw and w32api
directories.
(MINGW_LDFLAGS): Redefine as -static to force static linking
with libgcc and libstdc++.
* Makefile.in: Remove references to mingw and w32api directories
from Cygwin targets.
2012-07-30 Christopher Faylor <me.cygwin2012@cgf.cx> 2012-07-30 Christopher Faylor <me.cygwin2012@cgf.cx>
* Makefile.common (CFLAGS_COMMON): Add temporary define to work around * Makefile.common (CFLAGS_COMMON): Add temporary define to work around

26
winsup/Makefile.common
View File

@ -72,38 +72,22 @@ ifeq (,${findstring $(cygwin_source)/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}
cygwin_include:=-I$(cygwin_source)/include cygwin_include:=-I$(cygwin_source)/include
endif endif
# Try to determine what directories are available in winsup.
# Attempt to properly detect missing mingw or w32api and adjust command
# line parameters appropriately
# nostdinc:=${shell [ -d "$(updir)/w32api" ] && echo "-nostdinc"}
# ifneq (,$(nostdinc))
nostdincxx:=-nostdinc++ nostdincxx:=-nostdinc++
# ifeq (,${findstring $(w32api_source),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
w32api_include:=-I$(w32api_source)/include
# endif
# endif
mingw_include:=${shell [ -d "$(mingw_source)/include" ] && echo "-I$(mingw_source)/include"}
ifneq (,$(mingw_include))
nostdlib:=-nostdlib nostdlib:=-nostdlib
else
nostdlib:=
endif
ifeq (,${nostdlib}) ifeq (,${nostdlib})
nostdinc:= nostdinc:=
endif endif
INCLUDES:=-I. $(cygwin_include) -I$(cygwin_source) $(newlib_include) $(w32api_include) INCLUDES:=-I. $(cygwin_include) -I$(cygwin_source) $(newlib_include)
ifdef CONFIG_DIR ifdef CONFIG_DIR
INCLUDES+=-I$(CONFIG_DIR) INCLUDES+=-I$(CONFIG_DIR)
endif endif
MINGW_INCLUDES:=${mingw_include} $(w32api_include) MINGW_LDFLAGS:=-static
MINGW_CFLAGS:=-mno-cygwin $(MINGW_INCLUDES) MINGW_CFLAGS:=
MINGW_CXXFLAGS:=${filter-out $(newlib_source)/%,$(CXXFLAGS)} -mno-cygwin $(MINGW_INCLUDES) MINGW_CXXFLAGS:=
MINGW_LDFLAGS:=-L${mingw_build} -L${mingw_build}/mingwex
GCC_DEFAULT_OPTIONS:=$(CFLAGS_COMMON) $(CFLAGS_CONFIG) $(INCLUDES) GCC_DEFAULT_OPTIONS:=$(CFLAGS_COMMON) $(CFLAGS_CONFIG) $(INCLUDES)
@ -134,7 +118,7 @@ COMPILE_CXX=$(CXX) $c $(if $($(*F)_STDINCFLAGS),,$(nostdincxx) $(nostdinc)) \
$(ALL_CXXFLAGS) $(GCC_INCLUDE) -fno-rtti -fno-exceptions $(ALL_CXXFLAGS) $(GCC_INCLUDE) -fno-rtti -fno-exceptions
COMPILE_CC=$(CC) $c $(if $($(*F)_STDINCFLAGS),,$(nostdinc)) $(ALL_CFLAGS) $(GCC_INCLUDE) COMPILE_CC=$(CC) $c $(if $($(*F)_STDINCFLAGS),,$(nostdinc)) $(ALL_CFLAGS) $(GCC_INCLUDE)
vpath %.a $(cygwin_build):$(w32api_lib):$(newlib_build)/libc:$(newlib_build)/libm vpath %.a $(cygwin_build):$(newlib_build)/libc:$(newlib_build)/libm
MAKEOVERRIDES_WORKAROUND=${wordlist 2,1,a b c} MAKEOVERRIDES_WORKAROUND=${wordlist 2,1,a b c}

10
winsup/Makefile.in
View File

@ -121,20 +121,20 @@ check: cygwin
fi; \ fi; \
$(MAKE) check $(MAKE) check
utils: cygwin mingw utils: cygwin
mingw: w32api mingw: w32api
cygwin: w32api cygwin:
cygserver: cygwin cygserver: cygwin
install_utils: cygwin mingw install_utils: cygwin
install_mingw: w32api install_mingw: w32api
install_cygwin: w32api install_cygwin:
install_cygserver: cygwin install_cygserver: cygwin
lsaauth: mingw cygwin lsaauth:

421
winsup/configure vendored
View File

File diff suppressed because it is too large Load Diff

24
winsup/configure.in
View File

@ -32,33 +32,17 @@ case "$target" in
if ! test -d $srcdir/cygwin; then if ! test -d $srcdir/cygwin; then
AC_MSG_ERROR("No cygwin dir. Can't build Cygwin. Exiting...") AC_MSG_ERROR("No cygwin dir. Can't build Cygwin. Exiting...")
fi fi
AC_CONFIG_SUBDIRS(cygwin) AC_CONFIG_SUBDIRS(cygwin cygserver lsaauth utils doc)
INSTALL_LICENSE="install-license" INSTALL_LICENSE="install-license"
;; ;;
*mingw*) *mingw*)
if ! test -d $srcdir/mingw; then if ! test -d $srcdir/mingw; then
AC_MSG_ERROR("No mingw dir. Can't build Mingw. Exiting...") AC_MSG_ERROR("No mingw dir. Can't build Mingw. Exiting...")
fi fi
;; AC_CONFIG_SUBDIRS(mingw)
esac if test -d $srcdir/w32api; then
AC_CONFIG_SUBDIRS(w32api)
if test -d $srcdir/mingw; then
AC_CONFIG_SUBDIRS(mingw)
fi
AC_CONFIG_SUBDIRS(w32api cygserver)
case "$with_cross_host" in
""|*cygwin*)
# if test -d $srcdir/bz2lib; then
# AC_CONFIG_SUBDIRS(bz2lib)
# fi
# if test -d $srcdir/zlib; then
# AC_CONFIG_SUBDIRS(zlib)
# fi
if test -d $srcdir/lsaauth; then
AC_CONFIG_SUBDIRS(lsaauth)
fi fi
AC_CONFIG_SUBDIRS(utils doc)
;; ;;
esac esac