Go back to using ld for libmsgpack-c

Also shorten GHA job names
nicolasff · Nov 4, 2023 · 55c05ec · 55c05ec
1 parent 9630672
commit 55c05ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on: [workflow_dispatch]
 
 jobs:
 
-  build-and-test-linux:
+  validation-linux:
     strategy:
       fail-fast: false  # don't cancel other jobs in the matrix if one fails
       matrix:
@@ -101,7 +101,7 @@ jobs:
 
 
 
-  build-and-test-macos:
+  validation-macos:
     if: false  # FIXME: restore before merging to master
     strategy:
       fail-fast: false

diff --git a/Makefile b/Makefile
@@ -40,12 +40,12 @@ ifeq ($(strip $(MSGPACKC_LD)),0)
 	LDFLAGS += -lmsgpackc
 else
 # check for MessagePack-C (note the dash)
-MSGPACK_C_LIB=$(shell ls /usr/lib/libmsgpack-c.so 2>/dev/null)
-ifneq ($(strip $(MSGPACK_C_LIB)),)
+MSGPACK_C_LD=$(shell ld -lmsgpack-c >/dev/null 2>/dev/null; echo $$?)
+ifeq ($(strip $(MSGPACK_C_LD)),0)
 	FORMAT_OBJS += src/formats/msgpack.o
 	CFLAGS += -DMSGPACK=1
 	LDFLAGS += -lmsgpack-c
-endif # MSGPACK_C_LIB
+endif # MSGPACK_C_LD
 endif # MSGPACKC_LD
 endif # MSGPACK_OSX_LIB
 endif # MSGPACKC_LIB