From 7980bfb8293cd3de3c157c144730ad2282316b18 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 26 May 2009 14:02:04 +0000 Subject: Makefile.in (COMPILER, [...]): Define. ./: * Makefile.in (COMPILER, COMPILER_FLAGS): Define. (COMPILER_FOR_BUILD, BUILD_COMPILERFLAGS): Define. (ALL_COMPILERFLAGS): Define. (.c.o, xgcc$(exeext), cpp$(exeext)): Use $(COMPILER). (cc1-dummy$(exeext), cc1$(exeext)): Likewise. (collect2$(exeext), collect2.o): Likewise. (c-opts.o, c-cppbuiltin.o, c-pch.o, gcc.o, gccspec.o): Likewise. (gcc-options.o, version.o, prefix.o, toplev.o): Likewise. ($(out_object_file), mips-tfile, mips-tdump): Likewise. (libbackend.o, intl.o, cppdefault.o): Likewise. (gcov$(exeext), gcov-dump$(exeext)): Likewise. (build/%.o): Use $(COMPILER_FOR_BUILD). (build/gen%$(build_exeext)): Likewise. (build/gcov-iov$(build_exeext)): LIkewise. * config/t-darwin (darwin.o): Use $(COMPILER). (darwin-c.o, darwin-f.o, darwin-driver.o): Likewise. * config/t-sol2 (sol2-c.o): Likewise. (sol2.o): Likewise. * config/t-vxworks (vxworks.o): Likewise. * config/x-darwin (host-darwin.o): Likewise. * config/x-hpux (host-hpux.o): Likewise. * config/x-linux (host-linux.o): Likewise. * config/x-solaris (host-solaris.o): Likewise. * config/alpha/x-alpha (driver-alpha.o): Likewise. * config/arm/t-arm (arm-c.o): Likewise. * config/arm/t-pe (pe.o): Likewise. * config/arm/t-wince-pe (pe.o): Likewise. * config/i386/t-cygming (winnt.o): Likewise. (winnt-cxx.o, winnt-stubs.o, msformat-c.o): Likewise. * config/i386/t-cygwin (cygwin1.o): Likewise. (cygwin2.o): Likewise. * config/i386/t-i386 (i386-c.o): Likewise. * config/i386/t-interix (winnt.o): Likewise. * config/i386/t-netware (netware.o): Likewise. * config/i386/t-nwld (nwld.o): Likewise. * config/i386/x-darwin (host-i386-darwin.o): Likewise. * config/i386/x-i386 (driver-i386.o): Likewise. * config/i386/x-cygwin (host-cygwin.o): Likewise. * config/i386/x-mingw32 (host-mingw32.o): Likewise. * config/ia64/t-ia64 (ia64-c.o): Likewise. * config/m32c/t-m32c (m32c-pragma.o): Likewise. * config/mips/x-native (driver-native.o): Likewise. * config/rs6000/t-rs6000 (rs6000-c.o): Likewise. * config/rs6000/x-darwin (host-ppc-darwin.o): Likewise. * config/rs6000/x-darwin64 (host-ppc64-darwin.o): Likewise. * config/rs6000/x-rs6000 (driver-rs6000.o): Likewise. * config/score/t-score-elf (score7.o): Likewise. (score3.o): Likewise. * config/sh/t-sh (sh-c.o): Likewise. * config/sh/t-symbian (sh-c.o): Likewise. (symbian.o): Likewise. * config/spu/t-spu-elf (spu-c.o): Likewise. * config/v850/t-v850 (v850-c.o): Likewise. * config/v850/t-v850e (v850-c.o): Likewise. ada/: * gcc-interface/Makefile.in (COMPILER): Define. (COMPILER_FLAGS, ALL_COMPILERFLAGS): Define. (.c.o, cio.o, init.o, initialize.o, targext.o): Use $(COMPILER). (seh_init.o, tracebak.o): Likewise. * gcc-interface/Make-lang.in (ada/targext.o): Likewise. (ada/cio.o, ada/init.o, ada/initialize.o, ada/raise.o): Likewise. (ada/tracebak.o, ada/cuintp.o, ada/decl.o, ada/misc.o): Likewise. (ada/targtyps.o, ada/trans.o, ada/utils.o): Likewise. (ada/utils2.o): Likewise. cp/: * Make-lang.in (g++spec.o): Use $(COMPILER). (g++$(exeext), cc1plus-dummy$(exeext)): Likewise. (cc1plus$(exeext)): Likewise. fortran/: * Make-lang.in (gfortranspec.o): Use $(COMPILER). (gfortran$(exeext), f951$(exeext), fortran/cpp.o): Likewise. java/: * Make-lang.in (jvspec.o): Use $(COMPILER). ($(XGCJ)$(exeext), jc1$(exeext), jcf-dump$(exeext)): Likewise. (jvgenmain$(exeext), java/jcf-io.o, java/jcf-path.o): Likewise. objc/: * Make-lang.in (cc1obj-dummy$(exeext)): Use $(COMPILER). (cc1obj$(exeext)): Likewise. objcp/: * Make-lang.in (cc1objplus-dummy$(exeext)): Use $(COMPILER). (cc1objplus$(exeext), objcp/objcp-act.o): Likwise. From-SVN: r147873 --- gcc/cp/Make-lang.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gcc/cp/Make-lang.in') diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index aadaae6..35843db 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -1,6 +1,6 @@ # Top level -*- makefile -*- fragment for GNU C++. # Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2007, 2008 +# 2005, 2007, 2008, 2009 # Free Software Foundation, Inc. #This file is part of GCC. @@ -54,13 +54,13 @@ c++: cc1plus$(exeext) g++spec.o: $(srcdir)/cp/g++spec.c $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) $(CONFIG_H) (SHLIB_LINK='$(SHLIB_LINK)'; \ - $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \ + $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \ $(INCLUDES) $(srcdir)/cp/g++spec.c) # Create the compiler driver for g++. GXX_OBJS = $(GCC_OBJS) g++spec.o intl.o prefix.o version.o g++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ + $(COMPILER) $(ALL_COMPILERFLAGS) $(LDFLAGS) -o $@ \ $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBS) # Create a version of the g++ driver which calls the cross-compiler. @@ -92,7 +92,7 @@ c++_OBJS = $(CXX_OBJS) dummy-checksum.o cc1plus-checksum.o cp/g++spec.o cp-warn = $(STRICT_WARN) cc1plus-dummy$(exeext): $(CXX_OBJS) dummy-checksum.o $(BACKEND) $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ + $(COMPILER) $(ALL_COMPILERFLAGS) $(LDFLAGS) -o $@ \ $(CXX_OBJS) dummy-checksum.o $(BACKEND) $(LIBS) $(BACKENDLIBS) cc1plus-checksum.c : cc1plus-dummy$(exeext) build/genchecksum$(build_exeext) @@ -101,7 +101,7 @@ cc1plus-checksum.c : cc1plus-dummy$(exeext) build/genchecksum$(build_exeext) cc1plus-checksum.o : cc1plus-checksum.c cc1plus$(exeext): $(CXX_OBJS) cc1plus-checksum.o $(BACKEND) $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ + $(COMPILER) $(ALL_COMPILERFLAGS) $(LDFLAGS) -o $@ \ $(CXX_OBJS) cc1plus-checksum.o $(BACKEND) $(LIBS) $(BACKENDLIBS) # Special build rules. -- cgit v1.1