Skip to content

Commit 3461c7b

Browse files
committed
8316532: Native library copying in BuildMicrobenchmark.gmk cause dups on macOS
Reviewed-by: ihse, redestad
1 parent 3301fb1 commit 3461c7b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

make/test/BuildMicrobenchmark.gmk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ $(eval $(call SetupTestFilesCompilation, BUILD_MICROBENCHMARK_LIBRARIES, \
156156

157157
# Setup copy of native dependencies to image output dir
158158
$(eval $(call SetupCopyFiles, COPY_MICROBENCHMARK_NATIVE, \
159-
SRC := $(MICROBENCHMARK_NATIVE_OUTPUT), \
159+
SRC := $(MICROBENCHMARK_NATIVE_OUTPUT)/lib, \
160160
DEST := $(MICROBENCHMARK_IMAGE_DIR)/native, \
161-
FILES := $(BUILD_MICROBENCHMARK_LIBRARIES), \
162-
FLATTEN := true, \
161+
FILES := $(filter $(MICROBENCHMARK_NATIVE_OUTPUT)/lib/%, \
162+
$(BUILD_MICROBENCHMARK_LIBRARIES)), \
163163
))
164164

165165
all: $(MICROBENCHMARK_JAR) $(BUILD_MICROBENCHMARK_LIBRARIES) $(COPY_MICROBENCHMARK_NATIVE)

0 commit comments

Comments
 (0)