diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2012-10-24 14:11:15 +0400 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2012-10-24 14:11:15 +0400 |
| commit | 68157644d15d2486a3602eb1dcec91da029ca992 (patch) | |
| tree | e9130bec665fa837e605a1903c962508296863ea /winsup/Makefile.common | |
| parent | 02fbb3bb593e6c090439a14a321256fcd3a9241e (diff) | |
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.
Diffstat (limited to 'winsup/Makefile.common')
| -rw-r--r-- | winsup/Makefile.common | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/winsup/Makefile.common b/winsup/Makefile.common index 1917e3d21..06526c394 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -72,38 +72,22 @@ ifeq (,${findstring $(cygwin_source)/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)} cygwin_include:=-I$(cygwin_source)/include 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++ -# 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 -else -nostdlib:= -endif ifeq (,${nostdlib}) nostdinc:= endif -INCLUDES:=-I. $(cygwin_include) -I$(cygwin_source) $(newlib_include) $(w32api_include) +INCLUDES:=-I. $(cygwin_include) -I$(cygwin_source) $(newlib_include) ifdef CONFIG_DIR INCLUDES+=-I$(CONFIG_DIR) endif -MINGW_INCLUDES:=${mingw_include} $(w32api_include) -MINGW_CFLAGS:=-mno-cygwin $(MINGW_INCLUDES) -MINGW_CXXFLAGS:=${filter-out $(newlib_source)/%,$(CXXFLAGS)} -mno-cygwin $(MINGW_INCLUDES) -MINGW_LDFLAGS:=-L${mingw_build} -L${mingw_build}/mingwex +MINGW_LDFLAGS:=-static +MINGW_CFLAGS:= +MINGW_CXXFLAGS:= 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 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} |