[jdk20] RFR: 8298459: Fix msys2 linking and handling out of tree build directory for source zip creation [v2]

Christoph Langer clanger at openjdk.org
Fri Dec 9 14:40:09 UTC 2022


On Fri, 9 Dec 2022 14:22:04 GMT, Erik Joelsson <erikj at openjdk.org> wrote:

>> Christoph Langer has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Use make conditionals instead of shell
>
> make/common/MakeBase.gmk line 319:
> 
>> 317: 	else \
>> 318: 	  $(LN) -s '$(call DecodeSpace, $(call RelativePath, $<, $(@D)))' '$(call DecodeSpace, $@)'; \
>> 319: 	fi
> 
> I think it would be better to evaluate this conditional in make rather than the shell. Something like this:
> Suggestion:
> 
> 	ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys2)
> 	  cmd //c "mklink /J $(call FixPath, $(call DecodeSpace, $@)) $(call FixPath, $(call DecodeSpace, $<))"
> 	else
> 	  $(LN) -s '$(call DecodeSpace, $(call RelativePath, $<, $(@D)))' '$(call DecodeSpace, $@)'
> 	endif
> 
> Just note that the make conditional lines need to be space indented. Same goes for the expression below.

Thanks, that's the kind of suggestions I was hoping for from the build experts. 😄 I pushed a commit, let's see if it works...

-------------

PR: https://git.openjdk.org/jdk20/pull/9



More information about the build-dev mailing list