Skip to content

Make the script aware of sed's path #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SConaway wants to merge 1 commit into
base: macos-10-14-sdk221
Choose a base branch
from
Open

Make the script aware of sed's path #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ endif
PATCH = patch -b -N
UNZIP = unzip -q -o
ifeq ($(MACOS),1)
SED = /usr/local/bin/sed
SED ?= /usr/local/bin/sed
else
SED = sed
SED ?= sed
endif

VENDOR_SDK_ZIP = $(VENDOR_SDK_ZIP_$(VENDOR_SDK))
Expand Down
15 changes: 11 additions & 4 deletions esp-open-sdk-mac-bsd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,20 @@ elif [ ${MACOS} = 1 ]; then
fi


if [ "$(echo "123 abc" | sed -r 's/[0-9]+/& &/')" = "123 123 abc" ];
then
SED=$(which sed)
echo "Using sed from $SED"
else
echo no
fi


# call make

if [ ${FREEBSD} = 1 ]; then
gmake STANDALONE=y FREEBSD=1
elif [ ${MACOS} = 1 ]; then
make STANDALONE=y MACOS=1
if [ ${FREEBSD} = 1 ]; then
gmake STANDALONE=y FREEBSD=1 SED=$SED
elif [ ${MACOS} = 1 ]; then
make STANDALONE=y MACOS=1 SED=$SED
fi