[Buildroot] [PATCH] pkg-cmaketargets.mk: do not hardcode absolute path in toolchainfile.cmake

[Arnout Vandecappelle <arnout@mind.be>]

On 20/04/14 11:04, Samuel Martin wrote:
> Hi Arnout, all,
> 
> On Mon, Mar 3, 2014 at 8:05 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
>> On 01/03/14 18:16, Samuel Martin wrote:
>>> The patch allows sharing or moving the toolchains.
>>>
>>> This is a step toward making the toolchain/sdk relocatable.
>>>
>>> Closes #6818
>>>
>>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>>> Cc: Uwe Strempel <u.strempel@googlemail.com>
>>> ---
>>>  package/pkg-cmake.mk | 12 +++++++-----
>>>  1 file changed, 7 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
>>> index f7e454b..4effb15 100644
>>> --- a/package/pkg-cmake.mk
>>> +++ b/package/pkg-cmake.mk
>>> @@ -159,16 +159,18 @@ host-cmake-package = $(call inner-cmake-package,host-$(pkgname),$(call UPPERCASE
>>>  $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
>>>       @mkdir -p $(@D)
>>>       @echo -en "\
>>> +     get_filename_component(_HOST_DIR \$${CMAKE_CURRENT_LIST_FILE} PATH)\n\
>>> +     set(_HOST_DIR \"\$${_HOST_DIR}/../../..\")\n\
>>>       set(CMAKE_SYSTEM_NAME Linux)\n\
>>> -     set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\
>>> -     set(CMAKE_CXX_COMPILER $(TARGET_CXX_NOCCACHE))\n\
>>> +     set(CMAKE_C_COMPILER \"\$${_HOST_DIR}/$(subst $(HOST_DIR)/,,$(TARGET_CROSS))gcc\")\n\
>>
>>  Wouldn't it be more natural to write
>>
>> set(CMAKE_C_COMPILER \"$(subst $(HOST_DIR)/,\$${_HOST_DIR}/,$(TARGET_CC_NOCCACHE)\")\n\
>>
>> ?
> 
> Good point! Will do.
> 
>>
>>  And BTW this entire piece of code could benefit from a
>> change in quoting style (' instead of ") and using printf
>> instead of echo -en. But that's of course unrelated :-)
> 
> Agree for printf, but the quoting seems not so easy...
> I run some tests [1], it seems that changing the quoting style may not work.
> BTW, any tip about how to change/fix this is more than welcome.
> 
> Regards,
> 
> [1] http://code.bulix.org/9v6wcw-86080

 Right, I forgot that the backslash is still passed. This would work, but
is not much better:

@printf \
'get_filename_component(_HOST_DIR $${CMAKE_CURRENT_LIST_FILE} PATH)\n'\
'...'\


 Or this works as well:

 @printf '$(subst $(sep),\n,$(TOOLCHAINFILE_CMAKE))' > $@


define TOOLCHAINFILE_CMAKE
  get_filename_component(_HOST_DIR $${CMAKE_CURRENT_LIST_FILE} PATH)
  ...
endef

 But I'm not 100% convinced that that is better either.


 Regards,
 Arnout

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F