Merge pull request adoptium#486 from sophia-guo/cygwin

Correct CYGWIN LIB_DIR
annaibm · Jan 8, 2024 · e2e6137 · e2e6137
2 parents 7475e03 + 95dca83
commit e2e6137
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/makefile b/makefile
@@ -38,7 +38,10 @@ endif
 ifndef LIB_DIR
 	LIB_DIR:=$(TEST_ROOT)$(D)TKG$(D)lib
 endif
-ifeq ($(CYGWIN),1)
+
+UNAME := uname
+UNAME_OS := $(shell $(UNAME) -s | $(CUT) -f1 -d_)
+ifeq ($(findstring CYGWIN,$(UNAME_OS)), CYGWIN)
 	LIB_DIR:=$(shell cygpath -w $(LIB_DIR))
 endif
 export LIB_DIR:=$(subst \,/,$(LIB_DIR))