fix mac ci

fangq · Sep 16, 2022 · 40f4630 · 40f4630
1 parent 961c54c
commit 40f4630
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -65,12 +65,12 @@ script:
          octave-cli --eval "addpath(pwd);cd test;run_zmat_test";
       fi
     - ${MAKE} -C src lib
-    - ${MAKE} -C example/c all LIBTYPE=static
+    - ${MAKE} -C example/c all
     - ${MAKE} -C src dll
     - if [ "$TRAVIS_OS_NAME" = "windows" ]; then
          cp lib/* example/c;
       fi
-    - ${MAKE} -C example/c all
+    - ${MAKE} -C example/c all LIBTYPE=
     - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
          ls -lt lib;
          DYLD_LIBRARY_PATH=lib example/c/testzmat;

diff --git a/example/c/Makefile b/example/c/Makefile
@@ -1,6 +1,6 @@
-LIBTYPE  ?= dynamic
+LIBTYPE?=-static
 
 all:
-	$(CC) -g -Wall -pedantic testzmat.c -o testzmat -I../../include -L../../lib -Wl,-B$(LIBTYPE) -lzmat -Wl,-Bdynamic -lz -lpthread
+	$(CC) -g -Wall -pedantic testzmat.c -o testzmat -I../../include -L../../lib $(LIBTYPE) -lzmat -lz -lpthread
 clean:
 	-rm -f testzmat