Changeset 389

Timestamp:

Mar 28, 2009, 11:49:49 AM (16 years ago)

Author:

cinc

Message:

Fix for build break on Linux. Now using a more portable function call. Fix for broken garbage collector on linux by using the system gc (tested with gentoo). Thanks to Doodle for looking into this.

Location:

trunk

Files:

• nom/Makefile.kmk (modified) (1 diff)
• nom/class_c/nomtestcase.c (modified) (1 diff)
• tests/Makefile.kmk (modified) (1 diff)

trunk/nom/Makefile.kmk

@@ -55 +55 @@
 ifeq ($(BUILD_TARGET),win)
  libnomobjtk_LIBS += $(PATH_LIB)/libnomgc$(SUFF_LIB)
-endif
+else
 ifeq ($(BUILD_TARGET),darwin_)
            libnomobjtk_LIBS += /opt/local/lib/libgc.dylib
-endif
+else
 ifeq ($(BUILD_TARGET),freebsd)
            libnomobjtk_LIBS += /usr/local/lib/libgc$(SUFF_DLL)
 else
+ifeq ($(BUILD_TARGET),linux)
+           libnomobjtk_LIBS += /usr/lib/libgc$(SUFF_DLL)
+else
            libnomobjtk_LIBS += $(PATH_LIB)/libnomgc$(SUFF_DLL)
+endif
+endif
+endif
 endif
 

trunk/nom/class_c/nomtestcase.c

@@ -82 +82 @@
 
     /* Only Methods starting with ˚test˚ are run. */
-    if(0!=strnstr( methodName, "test", 4))
+    if(strstr(methodName, "test")==methodName)
     {
       NOMTestResult* nResult=NOMTestResultNew();

trunk/tests/Makefile.kmk

@@ -93 +93 @@
 
 
-test-nom_LIBS.linux = $(PATH_LIB)/libnomgc.so
+#test-nom_LIBS.linux = $(PATH_LIB)/libnomgc.so