From 21bb17612dec27213805321fb656788ec423453f Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 4 Aug 2013 18:02:04 -0700
Subject: gras: jit factory automatically adds GRAS_ROOT include path

---
 grextras              | 2 +-
 lib/jit_factory.cpp   | 6 ++++++
 lib/module_loader.cpp | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/grextras b/grextras
index 08a5747..3aa900e 160000
--- a/grextras
+++ b/grextras
@@ -1 +1 @@
-Subproject commit 08a5747bff911f3c8722224d3d2a4f2f8fa68b10
+Subproject commit 3aa900e4908d82d222806a3a7d17faf94505d86e
diff --git a/lib/jit_factory.cpp b/lib/jit_factory.cpp
index cdcfc03..882ee05 100644
--- a/lib/jit_factory.cpp
+++ b/lib/jit_factory.cpp
@@ -23,6 +23,9 @@
 #include <fstream>
 #include <map>
 
+//defined in module loader
+std::string get_gras_runtime_include_path(void);
+
 /***********************************************************************
  * Helper function to call a clang compliation
  **********************************************************************/
@@ -60,6 +63,9 @@ static std::string call_clang(const std::string &source, const std::vector<std::
         cmd.push_back(flag.c_str());
     }
 
+    //root include path
+    cmd.push_back("-I"+get_gras_runtime_include_path());
+
     //format command string
     std::string command;
     BOOST_FOREACH(const std::string &c, cmd)
diff --git a/lib/module_loader.cpp b/lib/module_loader.cpp
index d64722d..de3aa87 100644
--- a/lib/module_loader.cpp
+++ b/lib/module_loader.cpp
@@ -61,6 +61,14 @@ static std::string my_get_env(const std::string &name, const std::string &defalt
     return (env_var != NULL)? env_var : defalt;
 }
 
+//used by jit factory, but defined here for lazyness
+std::string get_gras_runtime_include_path(void)
+{
+    const std::string root = my_get_env("GRAS_ROOT", "@GRAS_ROOT@");
+    const fs::path inc_path = fs::path(root) / "include";
+    return inc_path.string();
+}
+
 GRAS_STATIC_BLOCK(gras_module_loader)
 {
     //!search the GRAS_ROOT directory for this install
-- 
cgit