libbarrelfish: merging arch specific hearders for k1om and x86_64

[barrelfish] / lib / barrelfish / Hakefile

diff --git a/lib/barrelfish/Hakefile b/lib/barrelfish/Hakefile
index 8959d52..e791bd5 100644 (file)
--- a/lib/barrelfish/Hakefile
+++ b/lib/barrelfish/Hakefile
@@ -94,6 +94,9 @@
       arch_assembly "arm"     = [ "arch/arm/entry.S", "arch/arm/syscall.S" ]
       arch_assembly "armv7-m" = [ "arch/arm/entry.S", "arch/arm/syscall.S" ]
       arch_assembly _         = []
+      
+      arch_include "k1om"     = "include/arch/x86_64" 
+      arch_include _          = ""
 
   in
     build library { target = "barrelfish",
@@ -112,7 +115,7 @@
                                               ("spawn", ["rpcclient"]),
                                               ("arrakis", ["rpcclient"])],
                     addCFlags = [ "-DMORECORE_PAGESIZE="++(morecore_pagesize arch) ],
-                    addIncludes = [ "include", "include" ./. arch_dir ],
+                    addIncludes = [ "include", "include" ./. arch_dir, (arch_include arch) ],
                     addGeneratedDependencies = [ "/include/asmoffsets.h" ]
                   }
  ) | arch <- allArchitectures ] ++
@@ -187,6 +190,9 @@
       arch_assembly "x86_64"  = [ "arch/x86_64/entry.S" ]
       arch_assembly "arm"     = [ "arch/arm/entry.S", "arch/arm/syscall.S" ]
       arch_assembly _         = []
+      
+      arch_include "k1om"     = "include/arch/x86_64" 
+      arch_include _          =  ""
 
   in
     build library { target = "arrakis",
@@ -205,7 +211,7 @@
                                               ("octopus", ["rpcclient"]),
                                               ("spawn", ["rpcclient"]),
                                               ("arrakis", ["rpcclient"])],
-                    addIncludes = [ "include", "include" ./. arch_dir ],
+                    addIncludes = [ "include", "include" ./. arch_dir, (arch_include arch) ],
                     addGeneratedDependencies = [ "/include/asmoffsets.h" ]
                   }
  ) | arch <- allArchitectures ]