Merge branch 'bugfix/macos_build' into 'master'

fix kconfig build on macOS

macOS version of sed doesn't recognize \r as special character.
Replacing with \x0D substitution which works everywhere.

See merge request !96
pull/20/head
Angus Gratton 2016-09-20 19:28:20 +08:00
commit af82eed35d
1 zmienionych plików z 1 dodań i 1 usunięć

Wyświetl plik

@ -302,7 +302,7 @@ zconf.lex.c: zconf.l
zconf.hash.c: zconf.gperf
# strip CRs on Windows systems where gperf will otherwise barf on them
sed -E "s/\r//" zconf.gperf | gperf -t --output-file zconf.hash.c -a -C -E -g -k '1,3,$$' -p -t
sed -E "s/\\x0D$$//" zconf.gperf | gperf -t --output-file zconf.hash.c -a -C -E -g -k '1,3,$$' -p -t
zconf.tab.c: zconf.y
bison -t -l -p zconf -o zconf.tab.c zconf.y