Skip to content

Commit

Permalink
Merge pull request #116 from hugovincent/master
Browse files Browse the repository at this point in the history
Fix build scripts to work on OS X
  • Loading branch information
jserv committed Jul 8, 2015
2 parents 90d3015 + 0e9b303 commit e5c04b6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions external/kconfig/lxdialog/check-lxdialog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ldflags()
for ext in so a dylib ; do
for lib in ncursesw ncurses curses ; do
$cc -print-file-name=lib${lib}.${ext} | grep -q /
if [ $? -eq 0 ]; then
if [ $? -eq 0 ] || [ -f /usr/lib/lib${lib}.${ext} ]; then
echo "-l${lib}"
exit
fi
Expand All @@ -33,7 +33,7 @@ ccflags()
}

# Temp file, try to clean up after us
tmp=$(mktemp)
tmp=$(mktemp tmp.XXXXXXXXXX)
trap "rm -f $tmp" 0 1 2 3 15

# Check if we can link to ncurses
Expand Down
2 changes: 1 addition & 1 deletion mk/rules/symmap.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ifeq "$(CONFIG_SYMMAP)" "y"


cmd_elf_to_symmap = $(NM) $< | sort | cut -d' ' -f1,3 | \
sed -n "H;/kernel_text_start/h;/end_of_text/{x;p}"| \
sed -n "H;/kernel_text_start/h;/end_of_text/{x;p;}"| \
awk 'BEGIN { STRCOUNT = 0; COUNT = 0; } \
{ \
SYM = SYM "{ (void*) (0x"$$1"), "STRCOUNT" },\n"; \
Expand Down
2 changes: 1 addition & 1 deletion mk/toolchain.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ BUILDCC = $(HOST_COMPILE)gcc
# Misc Information
GIT_HEAD = $(shell git rev-parse HEAD)
MACH_TYPE = $(shell uname -m)
BUILD_TIME = $(shell date --iso=seconds)
BUILD_TIME = $(shell date +%FT%T%z)

CFLAGS_WARN = \
-Wall -Werror -Wundef -Wstrict-prototypes -Wno-trigraphs \
Expand Down

0 comments on commit e5c04b6

Please sign in to comment.