diff options
author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-06 08:58:29 -0700 |
---|---|---|
committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-06 08:58:33 -0700 |
commit | f10d127d36ada5b202cdea521e61b05522beb192 (patch) | |
tree | 44ae75bf0745de49fb46616afd4cf577cf7a258a /test/Rules.mak | |
parent | c3af26045aa44286482fbfe93097f24b48cfb6a3 (diff) | |
parent | 384a55ef9f3387ed33eadab3eefe5057b4daeadb (diff) |
Merge commit 'origin/master' into nptl
Conflicts:
libc/misc/utmp/utent.c
libc/sysdeps/linux/i386/bits/syscalls.h
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'test/Rules.mak')
-rw-r--r-- | test/Rules.mak | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/Rules.mak b/test/Rules.mak index 29b551fa1..2131a7b18 100644 --- a/test/Rules.mak +++ b/test/Rules.mak @@ -44,6 +44,7 @@ endif export TARGET_ARCH RM_R = $(Q)$(RM) -r +LN_S = $(Q)$(LN) -fs ifneq ($(KERNEL_HEADERS),) ifeq ($(patsubst /%,/,$(KERNEL_HEADERS)),/) |