diff options
-rw-r--r-- | recipes-core/openjdk/openjdk-8_72b05.bb | 1 | ||||
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-8_72b05.bb b/recipes-core/openjdk/openjdk-8_72b05.bb index e0a786a..1a01630 100644 --- a/recipes-core/openjdk/openjdk-8_72b05.bb +++ b/recipes-core/openjdk/openjdk-8_72b05.bb | |||
@@ -9,6 +9,7 @@ PATCHES_URI_append = "\ | |||
9 | file://openjdk8-fix-shark-build.patch;apply=no \ | 9 | file://openjdk8-fix-shark-build.patch;apply=no \ |
10 | file://openjdk8-fix-shark-stdc++11.patch;apply=no \ | 10 | file://openjdk8-fix-shark-stdc++11.patch;apply=no \ |
11 | file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \ | 11 | file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \ |
12 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ | ||
12 | " | 13 | " |
13 | 14 | ||
14 | do_compile_append() { | 15 | do_compile_append() { |
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch new file mode 100644 index 0000000..5e02f28 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Delay $CXX insertion until after make has evaluated the comma-separated list, | ||
2 | as any comma separated parameters in CXX (such as assembler arguments) would | ||
3 | break the build | ||
4 | |||
5 | Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | --- | ||
10 | --- make/common/NativeCompilation.gmk | ||
11 | +++ make/common/NativeCompilation.gmk | ||
12 | @@ -372,7 +372,7 @@ define SetupNativeCompilation | ||
13 | $$(foreach p,$$($1_SRCS), \ | ||
14 | $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ | ||
15 | $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \ | ||
16 | - $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS)))) | ||
17 | + $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$$(CXX),$$($1_ASFLAGS)))) | ||
18 | |||
19 | # On windows we need to create a resource file | ||
20 | ifeq ($(OPENJDK_TARGET_OS), windows) | ||