diff mbox

[v2] kbuild: comments correction & update on Makefile.host

Message ID 20171101014314.4575-1-caoj.fnst@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show

Commit Message

Cao jin Nov. 1, 2017, 1:43 a.m. UTC
host-cmulti means the composite host program that is compiled/linked
from several .c file, not .o file, because .o file could also be
compiled from .cpp file.

Bonus: update the stale comment.
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
 scripts/Makefile.host | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Cao jin Nov. 13, 2017, 10:50 a.m. UTC | #1
I guess maybe this trivial one is forgot:)
So, a friendly ping.

On 11/01/2017 09:43 AM, Cao jin wrote:
> host-cmulti means the composite host program that is compiled/linked
> from several .c file, not .o file, because .o file could also be
> compiled from .cpp file.
> 
> Bonus: update the stale comment.
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
>  scripts/Makefile.host | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/Makefile.host b/scripts/Makefile.host
> index 9cfd5c84d76f..8181df66d764 100644
> --- a/scripts/Makefile.host
> +++ b/scripts/Makefile.host
> @@ -25,11 +25,11 @@ host-cshlib := $(sort $(hostlibs-y) $(hostlibs-m))
>  host-cxxshlib := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
>  
>  # C code
> -# Executables compiled from a single .c file
> +# C Executables compiled from a single .c file
>  host-csingle	:= $(foreach m,$(__hostprogs), \
>  			$(if $($(m)-objs)$($(m)-cxxobjs),,$(m)))
>  
> -# C executables linked based on several .o files
> +# C executables compiled from several .c files, and only .c files
>  host-cmulti	:= $(foreach m,$(__hostprogs),\
>  		   $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m))))
>  
> @@ -50,7 +50,7 @@ host-cxxshobjs	:= $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs))))
>  
>  # output directory for programs/.o files
>  # hostprogs-y := tools/build may have been specified.
> -# Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
> +# Retrieve also directory of .o files from host-cobjs and host-cxxobjs notation
>  host-objdirs := $(dir $(__hostprogs) $(host-cobjs) $(host-cxxobjs))
>  
>  host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))
>
Masahiro Yamada Nov. 14, 2017, 10:31 a.m. UTC | #2
Hi Cao,

2017-11-01 10:43 GMT+09:00 Cao jin <caoj.fnst@cn.fujitsu.com>:
> host-cmulti means the composite host program that is compiled/linked
> from several .c file, not .o file, because .o file could also be
> compiled from .cpp file.
>
> Bonus: update the stale comment.
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
>  scripts/Makefile.host | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/Makefile.host b/scripts/Makefile.host
> index 9cfd5c84d76f..8181df66d764 100644
> --- a/scripts/Makefile.host
> +++ b/scripts/Makefile.host
> @@ -25,11 +25,11 @@ host-cshlib := $(sort $(hostlibs-y) $(hostlibs-m))
>  host-cxxshlib := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
>
>  # C code
> -# Executables compiled from a single .c file
> +# C Executables compiled from a single .c file


Is anything wrong with the current comment?


>  host-csingle   := $(foreach m,$(__hostprogs), \
>                         $(if $($(m)-objs)$($(m)-cxxobjs),,$(m)))
>
> -# C executables linked based on several .o files
> +# C executables compiled from several .c files, and only .c files

Your comment is even clearer, but
I think the current comment is also true, at least.

host-cmulti is liked from .o files
after each was compiled from .c


>  host-cmulti    := $(foreach m,$(__hostprogs),\
>                    $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m))))
>
> @@ -50,7 +50,7 @@ host-cxxshobjs        := $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs))))
>
>  # output directory for programs/.o files
>  # hostprogs-y := tools/build may have been specified.
> -# Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
> +# Retrieve also directory of .o files from host-cobjs and host-cxxobjs notation
>  host-objdirs := $(dir $(__hostprogs) $(host-cobjs) $(host-cxxobjs))
>
>  host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))
> --

I am removing all host-objdirs stuff.
I do not need this hunk.
Cao jin Nov. 14, 2017, 11:53 a.m. UTC | #3
Masahiro-san,

On 11/14/2017 06:31 PM, Masahiro Yamada wrote:
> Hi Cao,
> 
> 2017-11-01 10:43 GMT+09:00 Cao jin <caoj.fnst@cn.fujitsu.com>:
>>
>>  # C code
>> -# Executables compiled from a single .c file
>> +# C Executables compiled from a single .c file
> 
> 
> Is anything wrong with the current comment?
> 

Nothing wrong here, just make it looks the same style as its peer below.

>>  host-csingle   := $(foreach m,$(__hostprogs), \
>>                         $(if $($(m)-objs)$($(m)-cxxobjs),,$(m)))
>>
>> -# C executables linked based on several .o files
>> +# C executables compiled from several .c files, and only .c files
> 
> Your comment is even clearer, but
> I think the current comment is also true, at least.
> 

Yes, just make it more clearer and looks the same style as its peer above.

> host-cmulti is liked from .o files
> after each was compiled from .c
> 
> 

>>  # output directory for programs/.o files
>>  # hostprogs-y := tools/build may have been specified.
>> -# Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
>> +# Retrieve also directory of .o files from host-cobjs and host-cxxobjs notation
>>  host-objdirs := $(dir $(__hostprogs) $(host-cobjs) $(host-cxxobjs))
>>
>>  host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))
>> --
> 
> I am removing all host-objdirs stuff.
> I do not need this hunk.
> 

I forget your patches, sorry for the noise here.
diff mbox

Patch

diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 9cfd5c84d76f..8181df66d764 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -25,11 +25,11 @@  host-cshlib := $(sort $(hostlibs-y) $(hostlibs-m))
 host-cxxshlib := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
 
 # C code
-# Executables compiled from a single .c file
+# C Executables compiled from a single .c file
 host-csingle	:= $(foreach m,$(__hostprogs), \
 			$(if $($(m)-objs)$($(m)-cxxobjs),,$(m)))
 
-# C executables linked based on several .o files
+# C executables compiled from several .c files, and only .c files
 host-cmulti	:= $(foreach m,$(__hostprogs),\
 		   $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m))))
 
@@ -50,7 +50,7 @@  host-cxxshobjs	:= $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs))))
 
 # output directory for programs/.o files
 # hostprogs-y := tools/build may have been specified.
-# Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
+# Retrieve also directory of .o files from host-cobjs and host-cxxobjs notation
 host-objdirs := $(dir $(__hostprogs) $(host-cobjs) $(host-cxxobjs))
 
 host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))