From 7f0202182455d5705501dda97e86aa99506b13b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= Date: Thu, 2 Jan 2020 10:19:29 +0100 Subject: [PATCH 1010/1013] hotspot: fix adlc flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit adlc is built using the native toolchain, not the crosscompiler. It however was incorrectly using flags meant for the crosscompiler. Upstream-Status: Inappropriate [Yocto-specific fixes] Signed-off-by: Erkka Kääriä Signed-off-by: Richard Leitner --- make/linux/makefiles/adlc.make | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hotspot/make/linux/makefiles/adlc.make b/hotspot/make/linux/makefiles/adlc.make index 92b8b9b39..ae0aa0082 100644 --- a/hotspot/make/linux/makefiles/adlc.make +++ b/hotspot/make/linux/makefiles/adlc.make @@ -28,6 +28,16 @@ include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/rules.make +# Yocto specific fix - remove target machine flags and replace them with +# build machine flags, as this part is built using the native toolchain +CXXFLAGS:=$(filter-out $(TARGET_CXXFLAGS),$(CXXFLAGS)) +CFLAGS:=$(filter-out $(TARGET_CFLAGS),$(CFLAGS)) + +CXXFLAGS += $(BUILD_CXXFLAGS) +CFLAGS += $(BUILD_CFLAGS) + + + # ######################################################################### # OUTDIR must be the same as AD_Dir = $(GENERATED)/adfiles in top.make: -- 2.26.2