From 1b524afb982aa3e24563cbbe747c85134091d72f Mon Sep 17 00:00:00 2001 From: "KJK::Hyperion" Date: Fri, 16 Jan 2009 13:19:14 +0000 Subject: [PATCH] Echo [HOST-CC] and [HOST-LD] instead of [HOSTCC] and [HOSTLD] Also echo [HOST-AR] for invocations of the host "ar" Use [HOST-CC], [HOST-LD] and [HOST-AR] in bootstrap makefiles as well svn path=/trunk/; revision=38788 --- reactos/Makefile | 8 +- reactos/lib/inflib/inflib.mak | 14 +-- reactos/tools/bin2c.mak | 4 +- reactos/tools/buildno/buildno.mak | 4 +- reactos/tools/gendib/gendib.mak | 4 +- reactos/tools/nci/nci.mak | 4 +- reactos/tools/ofw_interface/ofw_interface.mak | 6 +- reactos/tools/pefixup.mak | 4 +- reactos/tools/raddr2line.mak | 6 +- .../rbuild/backend/mingw/modulehandler.cpp | 2 +- reactos/tools/rbuild/rbuild.mak | 110 +++++++++--------- reactos/tools/rsym.mak | 8 +- reactos/tools/tools.mak | 4 +- 13 files changed, 91 insertions(+), 87 deletions(-) diff --git a/reactos/Makefile b/reactos/Makefile index 1f26c931802..69ac10678ff 100644 --- a/reactos/Makefile +++ b/reactos/Makefile @@ -216,18 +216,19 @@ ifeq ($(HALFVERBOSEECHO),yes) ECHO_PCH =@echo $(QUOTE)[PCH] $@$(QUOTE) ECHO_CPP =@echo $(QUOTE)[CPP] $@$(QUOTE) ECHO_CC =@echo $(QUOTE)[CC] $<$(QUOTE) - ECHO_HOSTCC =@echo $(QUOTE)[HOSTCC] $<$(QUOTE) + ECHO_HOSTCC =@echo $(QUOTE)[HOST-CC] $<$(QUOTE) ECHO_CL =@echo $(QUOTE)[CL] $<$(QUOTE) ECHO_GAS =@echo $(QUOTE)[GAS] $<$(QUOTE) ECHO_NASM =@echo $(QUOTE)[NASM] $<$(QUOTE) ECHO_AR =@echo $(QUOTE)[AR] $@$(QUOTE) + ECHO_HOSTAR =@echo $(QUOTE)[HOST-AR] $@$(QUOTE) ECHO_WINEBLD =@echo $(QUOTE)[WINEBLD] $@$(QUOTE) ECHO_WRC =@echo $(QUOTE)[WRC] $@$(QUOTE) ECHO_WIDL =@echo $(QUOTE)[WIDL] $@$(QUOTE) ECHO_BIN2RES =@echo $(QUOTE)[BIN2RES] $<$(QUOTE) ECHO_DLLTOOL =@echo $(QUOTE)[DLLTOOL] $@$(QUOTE) ECHO_LD =@echo $(QUOTE)[LD] $@$(QUOTE) - ECHO_HOSTLD =@echo $(QUOTE)[HOSTLD] $@$(QUOTE) + ECHO_HOSTLD =@echo $(QUOTE)[HOST-LD] $@$(QUOTE) ECHO_LINK =@echo $(QUOTE)[LINK] $@$(QUOTE) ECHO_NM =@echo $(QUOTE)[NM] $@$(QUOTE) ECHO_OBJDUMP =@echo $(QUOTE)[OBJDUMP] $@$(QUOTE) @@ -251,15 +252,18 @@ else ECHO_PCH = ECHO_CPP = ECHO_CC = + ECHO_HOSTCC = ECHO_GAS = ECHO_NASM = ECHO_AR = + ECHO_HOSTAR = ECHO_WINEBLD = ECHO_WRC = ECHO_WIDL = ECHO_BIN2RES = ECHO_DLLTOOL = ECHO_LD = + ECHO_HOSTLD = ECHO_NM = ECHO_OBJDUMP = ECHO_RBUILD = diff --git a/reactos/lib/inflib/inflib.mak b/reactos/lib/inflib/inflib.mak index 090201b464a..fa23df27d8f 100755 --- a/reactos/lib/inflib/inflib.mak +++ b/reactos/lib/inflib/inflib.mak @@ -35,31 +35,31 @@ INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Iinclude/reactos -Iinclude $(HOST_CFLAGS) $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) - $(ECHO_AR) + $(ECHO_HOSTAR) $(host_ar) -r $@ $(INFLIB_HOST_OBJECTS) $(INFLIB_INT_)infcore.o: $(INFLIB_BASE_)infcore.c | $(INFLIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ $(INFLIB_INT_)infget.o: $(INFLIB_BASE_)infget.c | $(INFLIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ $(INFLIB_INT_)infput.o: $(INFLIB_BASE_)infput.c | $(INFLIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ $(INFLIB_INT_)infhostgen.o: $(INFLIB_BASE_)infhostgen.c | $(INFLIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ $(INFLIB_INT_)infhostget.o: $(INFLIB_BASE_)infhostget.c | $(INFLIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ $(INFLIB_INT_)infhostput.o: $(INFLIB_BASE_)infhostput.c | $(INFLIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(INFLIB_HOST_CFLAGS) -c $< -o $@ .PHONY: inflib_host diff --git a/reactos/tools/bin2c.mak b/reactos/tools/bin2c.mak index 28b3545c1d6..2236efe89df 100644 --- a/reactos/tools/bin2c.mak +++ b/reactos/tools/bin2c.mak @@ -23,11 +23,11 @@ BIN2C_HOST_LFLAGS = $(TOOLS_LFLAGS) bin2c: $(BIN2C_TARGET) $(BIN2C_TARGET): $(BIN2C_OBJECTS) | $(BIN2C_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gcc} $(BIN2C_OBJECTS) $(BIN2C_HOST_LFLAGS) -o $@ $(BIN2C_INT_)bin2c.o: $(BIN2C_BASE_)bin2c.c | $(BIN2C_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(BIN2C_HOST_CFLAGS) -c $< -o $@ .PHONY: bin2c_clean diff --git a/reactos/tools/buildno/buildno.mak b/reactos/tools/buildno/buildno.mak index d1c027d3e9f..e24d218b97d 100644 --- a/reactos/tools/buildno/buildno.mak +++ b/reactos/tools/buildno/buildno.mak @@ -35,11 +35,11 @@ BUILDNO_VERSION = include$(SEP)reactos$(SEP)version.h buildno: $(BUILDNO_TARGET) $(BUILDNO_TARGET): $(BUILDNO_OBJECTS) $(XML_SSPRINTF_OBJECTS) | $(BUILDNO_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gpp} $^ $(BUILDNO_HOST_LFLAGS) -o $@ $(BUILDNO_INT_)buildno.o: $(BUILDNO_BASE_)buildno.cpp $(BUILDNO_VERSION) | $(BUILDNO_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ .PHONY: buildno_clean diff --git a/reactos/tools/gendib/gendib.mak b/reactos/tools/gendib/gendib.mak index 98de71cb27a..0f625325792 100644 --- a/reactos/tools/gendib/gendib.mak +++ b/reactos/tools/gendib/gendib.mak @@ -29,11 +29,11 @@ GENDIB_HOST_CFLAGS = $(TOOLS_CFLAGS) GENDIB_HOST_LFLAGS = $(TOOLS_LFLAGS) $(GENDIB_TARGET): $(GENDIB_OBJECTS) | $(GENDIB_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gcc} $(GENDIB_OBJECTS) $(GENDIB_HOST_LFLAGS) -o $@ $(GENDIB_INT_)gendib.o: $(GENDIB_BASE_)gendib.c | $(GENDIB_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(GENDIB_HOST_CFLAGS) -c $< -o $@ .PHONY: gendib diff --git a/reactos/tools/nci/nci.mak b/reactos/tools/nci/nci.mak index d2480c0409f..c168b7d0d9f 100644 --- a/reactos/tools/nci/nci.mak +++ b/reactos/tools/nci/nci.mak @@ -29,11 +29,11 @@ NCI_HOST_CFLAGS = -Iinclude $(TOOLS_CFLAGS) NCI_HOST_LFLAGS = $(TOOLS_LFLAGS) $(NCI_TARGET): $(NCI_OBJECTS) | $(NCI_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_LFLAGS) -o $@ $(NCI_INT_)ncitool.o: $(NCI_BASE_)ncitool.c | $(NCI_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ .PHONY: nci diff --git a/reactos/tools/ofw_interface/ofw_interface.mak b/reactos/tools/ofw_interface/ofw_interface.mak index 105a072031e..a6b2f8698fd 100644 --- a/reactos/tools/ofw_interface/ofw_interface.mak +++ b/reactos/tools/ofw_interface/ofw_interface.mak @@ -39,11 +39,11 @@ OFW_INTERFACE_HOST_CFLAGS = $(TOOLS_CFLAGS) OFW_INTERFACE_HOST_LFLAGS = $(TOOLS_LFLAGS) $(OFW_INTERFACE_TARGET): $(OFW_INTERFACE_OBJECTS) | $(OFW_INTERFACE_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gpp} $(OFW_INTERFACE_OBJECTS) $(OFW_INTERFACE_HOST_LFLAGS) -o $@ $(OFW_INTERFACE_INT_)ofw_interface.o: $(OFW_INTERFACE_BASE_)ofw_interface.cpp | $(OFW_INTERFACE_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(OFW_INTERFACE_HOST_CFLAGS) -c $< -o $@ $(OFW_INTERFACE_SERVICE_FILES): $(OFW_INTERFACE_TARGET) $(OFW_INTERFACE_INPUT) @@ -53,7 +53,7 @@ $(OFW_INTERFACE_SERVICE_FILES): $(OFW_INTERFACE_TARGET) $(OFW_INTERFACE_INPUT) $(OFW_INTERFACE_OUTPUT) \ $(OFW_INTERFACE_SOURCE) \ $(OFW_INTERFACE_HEADER) - + .PHONY: ofw_interface ofw_interface: $(OFW_INTERFACE_TARGET) diff --git a/reactos/tools/pefixup.mak b/reactos/tools/pefixup.mak index 3ceb374b7e2..aae563adb42 100644 --- a/reactos/tools/pefixup.mak +++ b/reactos/tools/pefixup.mak @@ -23,11 +23,11 @@ PEFIXUP_HOST_LFLAGS = $(TOOLS_LFLAGS) pefixup: $(PEFIXUP_TARGET) $(PEFIXUP_TARGET): $(PEFIXUP_OBJECTS) | $(PEFIXUP_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gcc} $(PEFIXUP_OBJECTS) $(PEFIXUP_HOST_LFLAGS) -o $@ $(PEFIXUP_INT_)pefixup.o: $(PEFIXUP_BASE_)pefixup.c | $(PEFIXUP_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(PEFIXUP_HOST_CFLAGS) -c $< -o $@ .PHONY: pefixup_clean diff --git a/reactos/tools/raddr2line.mak b/reactos/tools/raddr2line.mak index 4f0c7c2add7..72e4190019c 100644 --- a/reactos/tools/raddr2line.mak +++ b/reactos/tools/raddr2line.mak @@ -24,15 +24,15 @@ RADDR2LINE_HOST_LFLAGS = $(TOOLS_LFLAGS) raddr2line: $(RADDR2LINE_TARGET) $(RADDR2LINE_TARGET): $(RADDR2LINE_OBJECTS) | $(RADDR2LINE_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gcc} $(RADDR2LINE_OBJECTS) $(RADDR2LINE_HOST_LFLAGS) -o $@ $(RADDR2LINE_INT_)raddr2line.o: $(RADDR2LINE_BASE_)raddr2line.c | $(RADDR2LINE_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(RADDR2LINE_HOST_CFLAGS) -c $< -o $@ #$(RADDR2LINE_INT_)rsym_common.o: $(RADDR2LINE_BASE_)rsym_common.c | $(RADDR2LINE_INT) -# $(ECHO_CC) +# $(ECHO_HOSTCC) # ${host_gcc} $(RADDR2LINE_HOST_CFLAGS) -c $< -o $@ .PHONY: raddr2line_clean diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp index fa1567e0713..93b92c351e7 100644 --- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp +++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp @@ -1055,7 +1055,7 @@ Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: Rule arRule2 ( "\t$(ECHO_AR)\n" "\t${ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); -Rule arHostRule2 ( "\t$(ECHO_AR)\n" +Rule arHostRule2 ( "\t$(ECHO_HOSTAR)\n" "\t${host_ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); Rule gasRule ( "$(source): ${$(module_name)_precondition}\n" diff --git a/reactos/tools/rbuild/rbuild.mak b/reactos/tools/rbuild/rbuild.mak index d0f84181302..bd2d87e4734 100644 --- a/reactos/tools/rbuild/rbuild.mak +++ b/reactos/tools/rbuild/rbuild.mak @@ -353,223 +353,223 @@ rbuild: $(RBUILD_TARGET) host_gpp += -g $(RBUILD_TARGET): $(RBUILD_OBJECTS) $(XML_SSPRINTF_OBJECTS) $(INFLIB_HOST_OBJECTS) | $(RBUILD_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gpp} $^ $(RBUILD_HOST_LFLAGS) -o $@ $(RBUILD_INT_)global.o: $(RBUILD_BASE_)global.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)automaticdependency.o: $(RBUILD_BASE_)automaticdependency.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)autoregister.o: $(RBUILD_BASE_)autoregister.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)bootstrap.o: $(RBUILD_BASE_)bootstrap.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)cdfile.o: $(RBUILD_BASE_)cdfile.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)compilationunit.o: $(RBUILD_BASE_)compilationunit.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)compilationunitsupportcode.o: $(RBUILD_BASE_)compilationunitsupportcode.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)compilerflag.o: $(RBUILD_BASE_)compilerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)configuration.o: $(RBUILD_BASE_)configuration.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)define.o: $(RBUILD_BASE_)define.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)directory.o: $(RBUILD_BASE_)directory.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)exception.o: $(RBUILD_BASE_)exception.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)filesupportcode.o: $(RBUILD_BASE_)filesupportcode.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)include.o: $(RBUILD_BASE_)include.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)installfile.o: $(RBUILD_BASE_)installfile.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)linkerflag.o: $(RBUILD_BASE_)linkerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)linkerscript.o: $(RBUILD_BASE_)linkerscript.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)module.o: $(RBUILD_BASE_)module.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)project.o: $(RBUILD_BASE_)project.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)rbuild.o: $(RBUILD_BASE_)rbuild.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)rule.o: $(RBUILD_BASE_)rule.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)stubbedcomponent.o: $(RBUILD_BASE_)stubbedcomponent.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)syssetupgenerator.o: $(RBUILD_BASE_)syssetupgenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)wineresource.o: $(RBUILD_BASE_)wineresource.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)xmlnode.o: $(RBUILD_BASE_)xmlnode.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_INT_)testsupportcode.o: $(RBUILD_BASE_)testsupportcode.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_BACKEND_INT_)backend.o: $(RBUILD_BACKEND_BASE_)backend.cpp $(RBUILD_HEADERS) | $(RBUILD_BACKEND_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MINGW_INT_)mingw.o: $(RBUILD_MINGW_BASE_)mingw.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MINGW_INT_)modulehandler.o: $(RBUILD_MINGW_BASE_)modulehandler.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MINGW_INT_)proxymakefile.o: $(RBUILD_MINGW_BASE_)proxymakefile.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MINGW_INT_)rule.o: $(RBUILD_MINGW_BASE_)rule.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_DEVCPP_INT_)devcpp.o: $(RBUILD_DEVCPP_BASE_)devcpp.cpp $(RBUILD_HEADERS) | $(RBUILD_DEVCPP_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_CODEBLOCKS_INT_)codeblocks.o: $(RBUILD_CODEBLOCKS_BASE_)codeblocks.cpp $(RBUILD_HEADERS) | $(RBUILD_CODEBLOCKS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_DEPMAP_INT_)dependencymap.o: $(RBUILD_DEPMAP_BASE_)dependencymap.cpp $(RBUILD_HEADERS) | $(RBUILD_DEPMAP_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_VREPORT_INT_)versionreport.o: $(RBUILD_VREPORT_BASE_)versionreport.cpp $(RBUILD_HEADERS) | $(RBUILD_VREPORT_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MSBUILD_INT_)msbuild.o: $(RBUILD_MSBUILD_BASE_)msbuild.cpp $(RBUILD_HEADERS) | $(RBUILD_MSBUILD_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MSVC_INT_)genguid.o: $(RBUILD_MSVC_BASE_)genguid.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MSVC_INT_)msvc.o: $(RBUILD_MSVC_BASE_)msvc.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MSVC_INT_)msvcmaker.o: $(RBUILD_MSVC_BASE_)msvcmaker.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_MSVC_INT_)vcprojmaker.o: $(RBUILD_MSVC_BASE_)vcprojmaker.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_OBJECTS) $(RBUILD_HEADERS) | $(RBUILD_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gpp} $(RBUILD_TEST_OBJECTS) $(INFLIB_HOST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ $(RBUILD_TESTS_INT_)cdfiletest.o: $(RBUILD_TESTS_BASE_)cdfiletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)compilationunittest.o: $(RBUILD_TESTS_BASE_)compilationunittest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)functiontest.o: $(RBUILD_TESTS_BASE_)functiontest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)iftest.o: $(RBUILD_TESTS_BASE_)iftest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)includetest.o: $(RBUILD_TESTS_BASE_)includetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)invoketest.o: $(RBUILD_TESTS_BASE_)invoketest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)linkerflagtest.o: $(RBUILD_TESTS_BASE_)linkerflagtest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)moduletest.o: $(RBUILD_TESTS_BASE_)moduletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)projecttest.o: $(RBUILD_TESTS_BASE_)projecttest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)sourcefiletest.o: $(RBUILD_TESTS_BASE_)sourcefiletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)symboltest.o: $(RBUILD_TESTS_BASE_)symboltest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ $(RBUILD_TESTS_INT_)alltests.o: $(RBUILD_TESTS_BASE_)alltests.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ diff --git a/reactos/tools/rsym.mak b/reactos/tools/rsym.mak index 527e548f275..88b4983fba1 100644 --- a/reactos/tools/rsym.mak +++ b/reactos/tools/rsym.mak @@ -19,7 +19,7 @@ RSYM_OBJECTS = \ ifeq ($(ARCH),amd64) RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) -D_TARGET_PE64 else -RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) +RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) endif RSYM_HOST_LFLAGS = $(TOOLS_LFLAGS) @@ -28,15 +28,15 @@ RSYM_HOST_LFLAGS = $(TOOLS_LFLAGS) rsym: $(RSYM_TARGET) $(RSYM_TARGET): $(RSYM_OBJECTS) | $(RSYM_OUT) - $(ECHO_LD) + $(ECHO_HOSTLD) ${host_gcc} $(RSYM_OBJECTS) $(RSYM_HOST_LFLAGS) -o $@ $(RSYM_INT_)rsym.o: $(RSYM_BASE_)rsym.c | $(RSYM_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@ $(RSYM_INT_)rsym_common.o: $(RSYM_BASE_)rsym_common.c | $(RSYM_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@ .PHONY: rsym_clean diff --git a/reactos/tools/tools.mak b/reactos/tools/tools.mak index 256ce7a09e8..aba60b19096 100644 --- a/reactos/tools/tools.mak +++ b/reactos/tools/tools.mak @@ -33,11 +33,11 @@ XML_SSPRINTF_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(XML_SSPRINTF_SOURCES:.cpp=.o)) $(TOOLS_INT_)ssprintf.o: $(TOOLS_BASE_)ssprintf.cpp $(XML_SSPRINTF_HEADERS) | $(TOOLS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(TOOLS_CPPFLAGS) -c $< -o $@ $(TOOLS_INT_)xml.o: $(TOOLS_BASE_)xml.cpp $(XML_SSPRINTF_HEADERS) | $(TOOLS_INT) - $(ECHO_CC) + $(ECHO_HOSTCC) ${host_gpp} $(TOOLS_CPPFLAGS) -c $< -o $@ include tools/bin2c.mak