Commit-ID: f61bdc3304281e9ff9eec4f1ed9fb15bcf4d8a5e Gitweb: http://git.kernel.org/tip/f61bdc3304281e9ff9eec4f1ed9fb15bcf4d8a5e Author: Wang Nan <wangn...@huawei.com> AuthorDate: Mon, 26 Sep 2016 07:26:55 +0000 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Wed, 5 Oct 2016 19:58:51 -0300
tools build: Support compiling C++ source file Add new rule to compile .cpp file to .o use g++. C++ support is required for built-in clang and LLVM support. Linker side support will be introduced by following commits. Signed-off-by: Wang Nan <wangn...@huawei.com> Cc: Alexei Starovoitov <a...@fb.com> Cc: He Kuang <heku...@huawei.com> Cc: Jiri Olsa <jo...@kernel.org> Cc: Zefan Li <lize...@huawei.com> Cc: pi3or...@163.com Link: http://lkml.kernel.org/r/1474874832-134786-2-git-send-email-wangn...@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/build/Build.include | 1 + tools/build/Makefile.build | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/tools/build/Build.include b/tools/build/Build.include index 0248938..1dcb95e 100644 --- a/tools/build/Build.include +++ b/tools/build/Build.include @@ -90,6 +90,7 @@ if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ # - per object C flags # - BUILD_STR macro to allow '-D"$(variable)"' constructs c_flags = -Wp,-MD,$(depfile),-MT,$@ $(CFLAGS) -D"BUILD_STR(s)=\#s" $(CFLAGS_$(basetarget).o) $(CFLAGS_$(obj)) +cxx_flags = -Wp,-MD,$(depfile),-MT,$@ $(CXXFLAGS) -D"BUILD_STR(s)=\#s" $(CXXFLAGS_$(basetarget).o) $(CXXFLAGS_$(obj)) ### ## HOSTCC C flags diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build index 190519a..99c0ccd 100644 --- a/tools/build/Makefile.build +++ b/tools/build/Makefile.build @@ -61,6 +61,9 @@ quiet_cmd_cc_o_c = CC $@ quiet_cmd_host_cc_o_c = HOSTCC $@ cmd_host_cc_o_c = $(HOSTCC) $(host_c_flags) -c -o $@ $< +quiet_cmd_cxx_o_c = CXX $@ + cmd_cxx_o_c = $(CXX) $(cxx_flags) -c -o $@ $< + quiet_cmd_cpp_i_c = CPP $@ cmd_cpp_i_c = $(CC) $(c_flags) -E -o $@ $< @@ -88,6 +91,10 @@ $(OUTPUT)%.o: %.c FORCE $(call rule_mkdir) $(call if_changed_dep,$(host)cc_o_c) +$(OUTPUT)%.o: %.cpp FORCE + $(call rule_mkdir) + $(call if_changed_dep,cxx_o_c) + $(OUTPUT)%.o: %.S FORCE $(call rule_mkdir) $(call if_changed_dep,$(host)cc_o_c)
