diff options
| author | Christopher Faylor <me@cgf.cx> | 2000-12-03 08:40:45 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2000-12-03 08:40:45 +0300 |
| commit | 8494f61e7caa353ce2073fa7e021a862aed7cf10 (patch) | |
| tree | ba59a014b76c7a226939dd7504caa40f0c1ee930 /winsup/Makefile.common | |
| parent | b0a187e20478d81b53dc9d40c35e6df65a94c7e0 (diff) | |
* Makefile.common: Eliminate checks for libgcc.a and libstdc++.a. Use CXX for
g++ compiles.
* configure.in: Find correct c++ compiler.
* configure: Regenerate.
Diffstat (limited to 'winsup/Makefile.common')
| -rw-r--r-- | winsup/Makefile.common | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/winsup/Makefile.common b/winsup/Makefile.common index 629c1e514..f11a4e398 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -85,16 +85,10 @@ c=-E o=.E endif -libstdcxx:=${subst \,/,${shell $(CC_FOR_TARGET) -print-file-name=libstdc++.a}} -ifeq ($(libstdcxx),${notdir $(libstdcxx)}) -LIBGCC+=${subst \,/,${shell $(CC_FOR_TARGET) -print-libgcc-file-name}} -else -LIBGCC:=${subst \,/,${shell $(CC_FOR_TARGET) -print-libgcc-file-name}} $(libstdcxx) -endif - -GCC_INCLUDE:=${word 1,${dir $(LIBGCC)}}/include +libgcc:=${subst \,/,${shell $(CC_FOR_TARGET) -print-libgcc-file-name}} +GCC_INCLUDE:=${word 1,${dir $(libgcc)}}/include -COMPILE_CXX:=$(CC) $c -nostdinc++ $(ALL_CXXFLAGS) -I$(GCC_INCLUDE) \ +COMPILE_CXX:=$(CXX) $c -nostdinc++ $(ALL_CXXFLAGS) -I$(GCC_INCLUDE) \ -fno-rtti -fno-exceptions COMPILE_CC:=$(CC) $c -nostdinc $(ALL_CFLAGS) -I$(GCC_INCLUDE) @@ -122,7 +116,7 @@ endif ifdef VERBOSE $(COMPILE_CXX) -o $(@D)/$(*F)$o $< else - @echo $(CC) $c $(CXXFLAGS) ... $(*F).cc + @echo $(CXX) $c $(CXXFLAGS) ... $(*F).cc @$(COMPILE_CXX) -o $(@D)/$(*F)$o $< endif |