Update c++ ldflags for better compatibility. (#91)

Seems to work with both clang and gcc on several platforms. But might need more differentiation to cover all variants. Closes #85.
mittinatten · Jun 13, 2023 · d5898c1 · d5898c1
1 parent 2b01039
commit d5898c1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -20,11 +20,10 @@ jobs:
             CXX: g++
             enable: "--enable-check --enable-json --enable-xml"
             deps: "check libjson-c-dev libxml2-dev libxml2-utils libc++-dev libc++abi-dev"
-          # causes linker errors, what else is needed?
-          # - CC: clang
-          #   CXX: clang
-          #   enable: "--enable-check --enable-json --enable-xml"
-          #   deps: "check libjson-c-dev libxml2-dev libxml2-utils libc++-dev libc++abi-dev"
+          - CC: clang
+            CXX: clang
+            enable: "--enable-check --enable-json --enable-xml"
+            deps: "check libjson-c-dev libxml2-dev libxml2-utils libc++-dev libc++abi-dev"
     runs-on: ubuntu-latest
     steps:
       - name: "Check out code"

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,6 +1,6 @@
 AM_LDFLAGS =
 AM_CFLAGS =
-freesasa_LDADD = -lc++
+freesasa_LDADD = -lstdc++
 AM_CPPFLAGS = -I$(top_srcdir)/third-party/gemmi/include/
 
 if COND_GCOV

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -20,7 +20,7 @@ test_api_SOURCES = test_main.c test_pdb.c test_freesasa.c test_structure.c \
 
 AM_CFLAGS += -I$(top_srcdir)/src -DDATADIR=\"$(top_srcdir)/tests/data/\" -DSHAREDIR=\"$(top_srcdir)/share/\"
 
-test_api_LDADD = ../src/libfreesasa.a
+test_api_LDADD = ../src/libfreesasa.a -ldl
 
 if USE_JSON
 test_api_SOURCES += test_json.c

diff --git a/tests/test_classifier.c b/tests/test_classifier.c
@@ -415,8 +415,12 @@ START_TEST(test_backbone)
 }
 END_TEST
 
+
 START_TEST(test_memerr)
 {
+    // the mocking of malloc, etc doesn't work with clang
+    #ifndef __clang__
+
     freesasa_set_verbosity(FREESASA_V_SILENT);
     set_fail_after(1);
     void *ptr[] = {freesasa_classifier_types_new(),
@@ -466,9 +470,11 @@ START_TEST(test_memerr)
     }
     fclose(config);
     freesasa_set_verbosity(FREESASA_V_NORMAL);
+    #endif // __clang__
 }
 END_TEST
 
+
 extern TCase *test_classifier_static();
 
 Suite *classifier_suite()

diff --git a/tests/test_coord.c b/tests/test_coord.c
@@ -84,6 +84,9 @@ END_TEST
 
 START_TEST(test_memerr)
 {
+    // the mocking of malloc, etc doesn't work with clang
+    #ifndef __clang__
+
     set_fail_after(0);
     static double v[18] = {0, 0, 0, 1, 1, 1, -1, 1, -1, 2, 0, -2, 2, 2, 0, -5, 5, 5};
     struct coord_t coord = {.xyz = v, .n = 6, .is_linked = 0};
@@ -104,6 +107,7 @@ START_TEST(test_memerr)
     freesasa_set_verbosity(FREESASA_V_NORMAL);
     freesasa_coord_free(coord_dyn);
     set_fail_after(0);
+    #endif // __clang__
 }
 END_TEST
 

diff --git a/tests/tools.c b/tests/tools.c
@@ -31,7 +31,7 @@ realloc(void * ptr, size_t s)
     return real_realloc(ptr, s);
 }
 
-void*
+char*
 strdup(const char *s)
 {
     if (fail_after > 0) {
@@ -40,7 +40,7 @@ strdup(const char *s)
             return NULL;
         }
     }
-    void *(*real_strdup)(const char*) = dlsym(RTLD_NEXT, "strdup");
+    char *(*real_strdup)(const char*) = dlsym(RTLD_NEXT, "strdup");
     return real_strdup(s);
 }
 
@@ -51,7 +51,7 @@ set_fail_after(int limit) {
     n_fails = 0;
 }
 
-int float_eq(double a, double b, double tolerance) 
+int float_eq(double a, double b, double tolerance)
 {
     if (fabs(a-b) < tolerance) return 1;
     printf("floats not equal: a = %f, b = %f, diff = %f, tolerance = %f\n",