Merge branch 'bugfix/osx_menuconfig_build' into 'master'
Allow OS X to build without libintl https://github.com/espressif/esp-idf/pull/42 I have tested this with the following configurations: - OS X with Xcode command line tools, no macports, no homebrew - OS X with Xcode command line tools and homebrew - OS X with Xcode IDE and macports All three work with this change, without it the first two had issues. See merge request !172
This commit is contained in:
commit
c8a43508e5
1 changed files with 6 additions and 2 deletions
|
@ -5,8 +5,8 @@
|
|||
ldflags()
|
||||
{
|
||||
if [ $(uname -s) == "Darwin" ]; then
|
||||
#OSX seems to need intl too
|
||||
echo -n "-lintl "
|
||||
#OSX seems to need ncurses too
|
||||
echo -n "-lncurses "
|
||||
fi
|
||||
pkg-config --libs ncursesw 2>/dev/null && exit
|
||||
pkg-config --libs ncurses 2>/dev/null && exit
|
||||
|
@ -41,6 +41,10 @@ ccflags()
|
|||
else
|
||||
echo '-DCURSES_LOC="<curses.h>"'
|
||||
fi
|
||||
if [ $(uname -s) == "Darwin" ]; then
|
||||
#OSX doesn't have libintl
|
||||
echo -n "-DKBUILD_NO_NLS -Wno-format-security "
|
||||
fi
|
||||
}
|
||||
|
||||
# Temp file, try to clean up after us
|
||||
|
|
Loading…
Reference in a new issue