Skip to content

Commit 9a8a935

Browse files
committed
use make abspath intead of shell realpath
1 parent e92583f commit 9a8a935

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/build_win_mac.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
# ---------------------------------------
2828
build-arm:
2929
strategy:
30+
fail-fast: false
3031
matrix:
3132
os: [windows-latest, macos-latest]
3233
runs-on: ${{ matrix.os }}

tools/top.mk

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,21 @@ THIS_MAKEFILE := $(lastword $(MAKEFILE_LIST))
2626

2727
# strip off /tools/top.mk to get for example ../../..
2828
TOP := $(patsubst %/tools/top.mk,%,$(THIS_MAKEFILE))
29-
#$(info top.mk: Initial TOP=$(TOP))
29+
$(info top.mk: Initial TOP=$(TOP))
3030

3131
# Set TOP to an absolute path, for example /tinyUSB (from ../../..)
3232
ifeq ($(CMDEXE),1)
3333
TOP := $(subst \,/,$(shell for %%i in ( $(TOP) ) do echo %%~fi))
3434
else
35-
TOP := $(shell realpath $(TOP))
35+
TOP := $(abspath $(TOP))
3636
endif
37-
#$(info top.mk: Top directory is $(TOP))
37+
38+
$(info top.mk: Top directory is $(TOP))
3839

3940
# Set CURRENT_PATH to the relative path from TOP to the current directory, ie examples/device/cdc_msc_freertos
4041
ifeq ($(CMDEXE),1)
4142
CURRENT_PATH := $(subst $(TOP)/,,$(subst \,/,$(shell echo %CD%)))
4243
else
43-
CURRENT_PATH := $(shell realpath --relative-to=$(TOP) `pwd`)
44+
CURRENT_PATH = $(subst $(TOP)/,,$(abspath .))
4445
endif
45-
#$(info top.mk: Path from top is $(CURRENT_PATH))
46+
$(info top.mk: CURRENT_PATH = $(CURRENT_PATH))

0 commit comments

Comments
 (0)