A few fixes for including boehm

jklyip · May 1, 2022 · 7f02f97 · 7f02f97
1 parent c8b53fe
commit 7f02f97
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/cscript.lisp b/cscript.lisp
@@ -7,8 +7,6 @@
 
 (k:library "libffi" :required t :min-version #+bsd "3.3-rc1" #-bsd "3.0.0")
 
-(k:library "bdw-gc" :required t :min-version "7.0.0" :gc :boehm)
-
 (k:library "zlib" :required t :min-version "1.0.0")
 
 #-darwin (k:library "libelf" :required t :min-version #+bsd "0.8.13" #-bsd ".183")

diff --git a/src/cscript.lisp b/src/cscript.lisp
@@ -1,3 +1,7 @@
+(k:includes #~"bdwgc/"
+            #~"bdwgc/include/"
+            #~"libatomic_ops/src/")
+
 (k:recurse #P"gctools/"
            #P"clbind/"
            #P"serveEvent/"

diff --git a/wscript b/wscript
@@ -1451,9 +1451,12 @@ def configure(cfg):
         cfg.env.append_value('INCLUDES',[mmtk_path.abspath()])
     else:
         # boehm includes
-        cfg.env.append_value('INCLUDES',"src/bdwgc/include")
-        cfg.env.append_value('INCLUDES',"src/bdwgc")
-        cfg.env.append_value('INCLUDES',"src/libatomic_ops/src")
+        bdwgc_path = cfg.path.find_node("src/bdwgc")
+        bdwgc_include_path = cfg.path.find_node("src/bdwgc/include")
+        libatomic_ops_src_path = cfg.path.find_node("src/libatomic_ops/src")
+        cfg.env.append_value('INCLUDES',[bdwgc_path.abspath()])
+        cfg.env.append_value('INCLUDES',[bdwgc_include_path.abspath()])
+        cfg.env.append_value('INCLUDES',[libatomic_ops_src_path.abspath()])
     if (cfg.env["ENABLE_MMTK"] == True):
         mmtk_path = cfg.path.find_node("src/mmtk-clasp/")
         cfg.env.append_value('INCLUDES',[mmtk_path.abspath()])