Skip to content
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

[minor] Fix build scripts to work on OS X #116

Merged
merged 1 commit into from
Jul 8, 2015
Merged

[minor] Fix build scripts to work on OS X #116

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 external/kconfig/lxdialog/check-lxdialog.sh
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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