From 56bb2e2c704808ad4d5f57c8b76522f21d6e9143 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 1 Mar 2022 00:34:39 -0500 Subject: [PATCH] JNI for test coverage #3965 strange work-around --- unit_tests/rules.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/unit_tests/rules.mk b/unit_tests/rules.mk index 1f940eda1d..3df9301610 100644 --- a/unit_tests/rules.mk +++ b/unit_tests/rules.mk @@ -11,6 +11,14 @@ endif BINARY_OUTPUT = $(BUILDDIR)/$(PROJECT) SHARED_OUTPUT = $(BUILDDIR)/lib_$(PROJECT) +ifeq ($(OS),Windows_NT) + # todo: something is not right here how can we avoid explicit suffix? + # should not gcc figure it out based on 'shared' option? + SHARED_OUTPUT_OPT = $(SHARED_OUTPUT).dll +else + SHARED_OUTPUT_OPT = $(SHARED_OUTPUT).so +endif + # Automatic compiler options OPT = $(USE_OPT) COPT = $(USE_COPT) @@ -131,14 +139,6 @@ else @$(CC) -c $(ASXFLAGS) $(TOPT) -I. $(IINCDIR) $< -o $@ endif -ifneq ($(OS),Windows_NT) - # todo: something is not right here how can we avoid explicit suffix? - # should not gcc figure it out based on 'shared' option? - SHARED_OUTPUT_OPT = $(SHARED_OUTPUT).dll -else - SHARED_OUTPUT_OPT = $(SHARED_OUTPUT).so -endif - $(BINARY_OUTPUT): $(OBJS) rm -rf $(BUILDDIR)/obj/*gcda ifeq ($(USE_VERBOSE_COMPILE),yes)