Yes, I have tested this consolidated version and it builds just fine for me.
Cheers
F.
On 21/06/18 11:57, John Paul Adrian Glaubitz wrote:
> Hi Fridrich!
>
> Is this still an issue? Shall I open a bug report in JBS?
>
> Adrian
>
> On 06/15/2018 06:02 PM, Fridrich Strba wrote:
>> Hello, Magnus,
>>
>> Your original patch had a problem, since the second statement overwrote
>> the $1_SRC_HEADER_FLAGS instead of appending to it. With that, things
>> like osSupport.hpp, jawt_md.h and so on could not be found in build of
>> tests. So, I modified your patch to read as attached and the build
>> finished. It is basically a 2-liner.
>>
>> Cheers
>>
>> Fridrich
>>
>> On 15/06/18 13:10, Magnus Ihse Bursie wrote:
>>> Here's a better patch. Please try and see if it solves your problems.
>>> Unfortunately, I'm leaving on vacation for today and will be gone most
>>> of the summer, so I can't help sponsor this patch. But if it works, I'm
>>> sure someone else can take over it.
>>>
>>> If it does not work, the original patch should at the very least be
>>> changed so that EXTRA_HEADER_DIRS gets an additional "$(call
>>> GetJavaHeaderDir, $(MODULE))", instead of the -I (which I've been trying
>>> hard to eradicate from the CFLAGS).
>
--- jdk11/make/common/JdkNativeCompilation.gmk Wed Jun 20 19:46:44 2018 -0700
+++ jdk11/make/common/JdkNativeCompilation.gmk Thu Jun 21 10:10:16 2018 +0200
@@ -119,9 +119,11 @@
endif
ifneq ($$($1_HEADERS_FROM_SRC), false)
- $1_SRC_HEADER_FLAGS := $$(foreach dir, $$(wildcard $$($1_SRC) \
- $$(call GetJavaHeaderDir, $$(MODULE))), -I$$(dir))
+ $1_SRC_HEADER_FLAGS := $$(addprefix -I, $$(wildcard $$($1_SRC)))
endif
+ # Always add the java header dir
+ $1_SRC_HEADER_FLAGS += $$(addprefix -I, $$(call GetJavaHeaderDir, $$(MODULE)))
+
ifneq ($$($1_EXTRA_HEADER_DIRS), )
$1_PROCESSED_EXTRA_HEADER_DIRS := $$(foreach dir, $$($1_EXTRA_HEADER_DIRS), \
$$(call ProcessDir, $$(dir)))
