Skip to content

Commit

Permalink
build: Treat MSYS2 build as a UNIX build
Browse files Browse the repository at this point in the history
Since MSYS2 provides a UNIX-like environment, treating it as a Windows
build caused issues with the paths.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
  • Loading branch information
carlescufi authored and Anas Nashif committed May 19, 2017
1 parent ed187eb commit d464929
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ UNAME := $(shell uname)
ifeq (MSYS, $(findstring MSYS, $(UNAME)))
DISABLE_TRYRUN=y
HOST_OS=MSYS
PWD_OPT=-W
else ifeq (MINGW, $(findstring MINGW, $(UNAME)))
HOST_OS=MINGW
PWD_OPT=-W
Expand Down
2 changes: 1 addition & 1 deletion zephyr-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fi
# .zephyrrc in your home directory. It will be automatically
# run (if it exists) by this script.

if uname | grep -q -P "MINGW|MSYS"; then
if uname | grep -q -P "MINGW"; then
win_build=1
PWD_OPT="-W"
else
Expand Down

0 comments on commit d464929

Please sign in to comment.