From 3461c7b16549b2aa456fffad9d6abe7e1bfc7260 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Wed, 20 Sep 2023 20:36:16 +0000 Subject: [PATCH] 8316532: Native library copying in BuildMicrobenchmark.gmk cause dups on macOS Reviewed-by: ihse, redestad --- make/test/BuildMicrobenchmark.gmk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk index 0369b4e0bb3..d1013a89233 100644 --- a/make/test/BuildMicrobenchmark.gmk +++ b/make/test/BuildMicrobenchmark.gmk @@ -156,10 +156,10 @@ $(eval $(call SetupTestFilesCompilation, BUILD_MICROBENCHMARK_LIBRARIES, \ # Setup copy of native dependencies to image output dir $(eval $(call SetupCopyFiles, COPY_MICROBENCHMARK_NATIVE, \ - SRC := $(MICROBENCHMARK_NATIVE_OUTPUT), \ + SRC := $(MICROBENCHMARK_NATIVE_OUTPUT)/lib, \ DEST := $(MICROBENCHMARK_IMAGE_DIR)/native, \ - FILES := $(BUILD_MICROBENCHMARK_LIBRARIES), \ - FLATTEN := true, \ + FILES := $(filter $(MICROBENCHMARK_NATIVE_OUTPUT)/lib/%, \ + $(BUILD_MICROBENCHMARK_LIBRARIES)), \ )) all: $(MICROBENCHMARK_JAR) $(BUILD_MICROBENCHMARK_LIBRARIES) $(COPY_MICROBENCHMARK_NATIVE)