aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern B. Brandenburg <bbb@cs.unc.edu>2011-01-25 16:20:36 -0500
committerBjoern B. Brandenburg <bbb@cs.unc.edu>2011-01-25 16:20:36 -0500
commit53d9a93a623d0edc662b6d00b3dea247a3f9224b (patch)
tree076b0c8a3f6b9ddc8ee058b98febcb5366b66600
parent34263b39b9cdf08c33a4e920eef7b0fc78f02759 (diff)
fix header detection on ARM2011.1
The ARM port uses <litmus... instead of "litmus..., so let's use egrep with a proper regular expression to reliably find the line that includes the Litmus system calls.
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 788db74..db94ffb 100644
--- a/Makefile
+++ b/Makefile
@@ -259,8 +259,9 @@ $(error Cannot build without access to the LITMUS^RT kernel source)
259endif 259endif
260 260
261kernel-unistd-hdrs := $(foreach file,${unistd-headers},${LITMUS_KERNEL}/$(file)) 261kernel-unistd-hdrs := $(foreach file,${unistd-headers},${LITMUS_KERNEL}/$(file))
262hdr-ok := $(shell grep '\#include "litmus/unistd' ${kernel-unistd-hdrs} ) 262hdr-ok := $(shell egrep '\#include ["<]litmus/unistd' ${kernel-unistd-hdrs} )
263ifeq ($(strip $(hdr-ok)),) 263ifeq ($(strip $(hdr-ok)),)
264$(info (!!) Could not find LITMUS^RT system calls in ${kernel-unistd-hdrs}.)
264$(error Your kernel headers do not seem to be LITMUS^RT headers) 265$(error Your kernel headers do not seem to be LITMUS^RT headers)
265endif 266endif
266 267