michaelh/zephyr
1
0
Fork 0
Code Releases Activity

build: Treat MSYS2 build as a UNIX build

Browse source 
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>
This commit is contained in:
Carles Cufi 2017-05-19 10:16:33 +02:00 • committed by Anas Nashif
commit d464929d2d
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -27,7 +27,6 @@ UNAME := $(shell uname)
ifeq (MSYS, $(findstring MSYS, $(UNAME))) ifeq (MSYS, $(findstring MSYS, $(UNAME)))
DISABLE_TRYRUN=y DISABLE_TRYRUN=y
HOST_OS=MSYS HOST_OS=MSYS
PWD_OPT=-W
else ifeq (MINGW, $(findstring MINGW, $(UNAME))) else ifeq (MINGW, $(findstring MINGW, $(UNAME)))
HOST_OS=MINGW HOST_OS=MINGW
PWD_OPT=-W PWD_OPT=-W

2
zephyr-env.sh
View file

@ -35,7 +35,7 @@ fi
# .zephyrrc in your home directory. It will be automatically # .zephyrrc in your home directory. It will be automatically
# run (if it exists) by this script. # 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 win_build=1
PWD_OPT="-W" PWD_OPT="-W"
else else