Re: [PATCH RFC] kbuild: fixes in Makefile.lib

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 11/13/2017 12:17 PM, Masahiro Yamada wrote:
> Hi Cao,
> 
> 

>>  scripts/Makefile.lib | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
>> index 580e605118e4..3209f303213b 100644
>> --- a/scripts/Makefile.lib
>> +++ b/scripts/Makefile.lib
>> @@ -22,7 +22,7 @@ lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m)))
>>  # Determine modorder.
>>  # Unfortunately, we don't have information about ordering between -y
>>  # and -m subdirs.  Just put -y's first.
>> -modorder       := $(patsubst %/,%/modules.order, $(filter %/, $(obj-y)) $(obj-m:.o=.ko))
>> +modorder       := $(patsubst %/,%/modules.order, $(filter %/, $(obj-y) $(obj-m) $(obj-m:.o=.ko))
> 
> 
> This change caused build error.
> 
> scripts/Makefile.lib:25: *** unterminated call to function 'patsubst':
> missing ')'.  Stop.
> 
> 
> And, this change is not necessary.
> 
> $(filter %/, $(obj-m)) is a subset of $(obj-m:.o=.ko)
> 

Ah huh! Yes

> 
>>  # Handle objects in subdirs
>>  # ---------------------------------------------------------------------------
>> @@ -49,7 +49,7 @@ single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m)))
>>  # Build list of the parts of our composite objects, our composite
>>  # objects depend on those (obviously)
>>  multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)) $($(m:.o=-y)))
>> -multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y)))
>> +multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))
>>  multi-objs   := $(multi-objs-y) $(multi-objs-m)
>>
>>  # $(subdir-obj-y) is the list of objects in $(obj-y) which uses dir/ to
> 
> 
> This is also build error.
> 
> scripts/Makefile.lib:52: *** unterminated call to function 'foreach':
> missing ')'.  Stop.
> 
> 
> Please test your patch before submitting.
> 

Sorry for my mistake,I missed to test the patch this time incredibly:(


> Assuming the build error will be fixed, this change is correct.
> 
> 
> 
> 
> Also, modname-multi should be fixed.
> 
> modname-multi = $(sort $(foreach m,$(multi-used),\
>                 $(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs))
> $($(m:.o=-y)) $($(m:.o=-m))),$(m:.o=))))
> 

Yes, I also noticed here, but fail to remember it:(

Thanks very much, Masahiro-san!

-- 
Sincerely,
Cao jin


--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux&nblp;USB Development]     [Linux Media]     [Video for Linux]     [Linux Audio Users]     [Yosemite Secrets]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux