diff --git a/buildspecs/linux_aarch64.spec b/buildspecs/linux_aarch64.spec index 057fe146017..08229cfd470 100644 --- a/buildspecs/linux_aarch64.spec +++ b/buildspecs/linux_aarch64.spec @@ -84,16 +84,16 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti - - - - - + + + + + - + diff --git a/buildspecs/linux_aarch64_cmprssptrs.spec b/buildspecs/linux_aarch64_cmprssptrs.spec index 8152f07d03b..5dc727145a5 100644 --- a/buildspecs/linux_aarch64_cmprssptrs.spec +++ b/buildspecs/linux_aarch64_cmprssptrs.spec @@ -83,16 +83,16 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti - - - - - + + + + + - + diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_aarch64.mk b/runtime/gc_glue_java/configure_includes/configure_linux_aarch64.mk index d66448c9485..aa798fd71c9 100644 --- a/runtime/gc_glue_java/configure_includes/configure_linux_aarch64.mk +++ b/runtime/gc_glue_java/configure_includes/configure_linux_aarch64.mk @@ -49,25 +49,24 @@ ifneq (,$(findstring _cross,$(SPEC))) --host=$(OPENJ9_CC_PREFIX) \ --build=x86_64-pc-linux-gnu \ 'OMR_CROSS_CONFIGURE=yes' -endif -ifeq (default,$(origin AS)) - AS = $(OPENJ9_CC_PREFIX)-as -endif -ifeq (default,$(origin CC)) - CC = $(OPENJ9_CC_PREFIX)-gcc -endif -ifeq (default,$(origin CXX)) - CXX = $(OPENJ9_CC_PREFIX)-g++ -endif -ifeq (default,$(origin AR)) - AR = $(OPENJ9_CC_PREFIX)-ar + ifeq (default,$(origin AS)) + AS = $(OPENJ9_CC_PREFIX)-as + endif + ifeq (default,$(origin CC)) + CC = $(OPENJ9_CC_PREFIX)-gcc + endif + ifeq (default,$(origin CXX)) + CXX = $(OPENJ9_CC_PREFIX)-g++ + endif + ifeq (default,$(origin AR)) + AR = $(OPENJ9_CC_PREFIX)-ar + endif endif CONFIGURE_ARGS += 'AS=$(AS)' CONFIGURE_ARGS += 'CC=$(CC)' CONFIGURE_ARGS += 'CXX=$(CXX)' -CONFIGURE_ARGS += 'OBJCOPY=$(OPENJ9_CC_PREFIX)-objcopy' CONFIGURE_ARGS += libprefix=lib exeext= solibext=.so arlibext=.a objext=.o