From 653a8d0cce267a0087f8b157a86c713e4ec5e1c1 Mon Sep 17 00:00:00 2001 From: Julian Waters Date: Thu, 15 Jun 2023 16:29:31 +0000 Subject: [PATCH] 8310129: SetupNativeCompilation LIBS should match the order of the other parameters Reviewed-by: erikj --- make/common/NativeCompilation.gmk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk index 8a837243ee2..9fb71dc2a79 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -500,7 +500,7 @@ endef # used both for C and C++. # LIBS_ the libraries to link to for the specified toolchain, # used both for C and C++. -# LIBS__ the libraries to link to for the specified target +# LIBS__ the libraries to link to for the specified target # OS and toolchain, used both for C and C++. # ARFLAGS the archiver flags to be used # OBJECT_DIR the directory where we store the object files @@ -1031,12 +1031,11 @@ define SetupNativeCompilationBody # Pickup extra OPENJDK_TARGET_OS_TYPE, OPENJDK_TARGET_OS and TOOLCHAIN_TYPE # dependent variables for LDFLAGS and LIBS, and additionally the pair dependent - # TOOLCHAIN_TYPE plus OPENJDK_TARGET_OS for LDFLAGS, or OPENJDK_TARGET_OS plus - # TOOLCHAIN_TYPE for LIBS + # TOOLCHAIN_TYPE plus OPENJDK_TARGET_OS $1_EXTRA_LDFLAGS += $$($1_LDFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS)) \ $$($1_LDFLAGS_$(TOOLCHAIN_TYPE)) $$($1_LDFLAGS_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS)) $1_EXTRA_LIBS += $$($1_LIBS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LIBS_$(OPENJDK_TARGET_OS)) \ - $$($1_LIBS_$(OPENJDK_TARGET_OS)_$(TOOLCHAIN_TYPE)) $$($1_LIBS_$(TOOLCHAIN_TYPE)) + $$($1_LIBS_$(TOOLCHAIN_TYPE)) $$($1_LIBS_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS)) ifneq ($$($1_REAL_MAPFILE), ) $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))