Skip to content

Commit

Permalink
Merge pull request #490 from RadekCap/cygwin-compilation-fix
Browse files Browse the repository at this point in the history
Use cut instead of $CUT
  • Loading branch information
sophia-guo authored Feb 1, 2024
2 parents 3509137 + c3190b2 commit 6ab3f8f
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ export JAVA_HOME := $(TEST_JDK_HOME)
$(info JAVA_HOME is set to $(JAVA_HOME))
endif




D = /
MKTREE = mkdir -p
SUBDIRS = ..
Expand All @@ -40,11 +37,12 @@ ifndef LIB_DIR
endif

UNAME := uname
UNAME_OS := $(shell $(UNAME) -s | $(CUT) -f1 -d_)
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))
$(info LIB_DIR is set to $(LIB_DIR))

_TESTTARGET = $(firstword $(MAKECMDGOALS))
TESTTARGET = $(patsubst _%,%,$(_TESTTARGET))
Expand Down

0 comments on commit 6ab3f8f

Please sign in to comment.