From 064e1a65a5ce848434e9ceef500d03f7bde65249 Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Thu, 10 Mar 2016 14:24:26 +0000 Subject: sysgen: Cope with non-inline kernel build When regenerating system call tables, cope with a local kernel tree where the kernel has been built into a separate directory (with `make O=...`) rather than inline. So: - LINUX makefile var / -linux command line option give location of source tree - LINUXBLD makefile var / -linuxbld command line option gives location of built kernel --- sysgen/fetch.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sysgen/fetch.go') diff --git a/sysgen/fetch.go b/sysgen/fetch.go index ad7cd58d1..0c43d3d7d 100644 --- a/sysgen/fetch.go +++ b/sysgen/fetch.go @@ -43,13 +43,14 @@ func fetchValues(arch string, vals []string, includes []string, defines map[stri "-D__KERNEL__", "-DKBUILD_MODNAME=\"-\"", "-I" + *flagLinux + "/arch/" + arch + "/include", - "-I" + *flagLinux + "/arch/" + arch + "/include/generated/uapi", - "-I" + *flagLinux + "/arch/" + arch + "/include/generated", + "-I" + *flagLinuxBld + "/arch/" + arch + "/include/generated/uapi", + "-I" + *flagLinuxBld + "/arch/" + arch + "/include/generated", + "-I" + *flagLinuxBld + "/include", "-I" + *flagLinux + "/include", "-I" + *flagLinux + "/arch/" + arch + "/include/uapi", - "-I" + *flagLinux + "/arch/" + arch + "/include/generated/uapi", + "-I" + *flagLinuxBld + "/arch/" + arch + "/include/generated/uapi", "-I" + *flagLinux + "/include/uapi", - "-I" + *flagLinux + "/include/generated/uapi", + "-I" + *flagLinuxBld + "/include/generated/uapi", "-I" + *flagLinux, "-include", *flagLinux + "/include/linux/kconfig.h", }...) -- cgit mrf-deployment