Skip to content

Some tweaks to get it to build under Ubuntu Xenial (16.04) #4

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
tkchia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Some tweaks to get it to build under Ubuntu Xenial (16.04) #4

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
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ DESTDIR ?= /usr/local
CORES ?= 1

# Basic feature detection
OS = $(shell cat /etc/os-release | grep "rhel\|fedora\|centos" && echo "rhel" || cat /etc/os-release | grep "debian\|ubuntu" && echo "debian" || uname)
OS = $(shell cat /etc/os-release | grep -q "rhel\|fedora\|centos" && echo "rhel" || cat /etc/os-release | grep -q "debian\|ubuntu" && echo "debian" || uname)
ARCH ?= $(shell uname -m)

ifeq ($(ARCH), i686)
Expand Down Expand Up @@ -113,12 +113,13 @@ t/%.exe: t/%.o $(LIB) Makefile
all: $(LIB)

$(SYSINC): /usr/include/$(UNISTD_PATH)/asm/unistd_$(MSIZE).h
echo -e "\n#define __SYSCALL(x,y)\n" >> $@
echo "#define __SYSCALL(x,y)" > $@
grep __NR_ $< | sed -e s/__NR_/SYS_/g >> $@
echo >> $@
ifeq ($(WITH_FAST_SYSCALL), 1)
echo -e "\n#define __RT0_WITH_FASTER_SYSCALL__ 1\n" >> $@
echo "#define __RT0_WITH_FASTER_SYSCALL__ 1" >> $@
endif
echo -e "\n#undef __SYSCALL\n" >> $@
echo "#undef __SYSCALL" >> $@

$(LIB): $(LOBJ)
$(AR) -rcs $@ $^
Expand Down