From 3047374693a438cac3a43f461cf223ec7a91ea87 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Sun, 6 Dec 2020 07:43:59 +0000 Subject: [PATCH] Drop hard coded linker flags. --- config.mk | 2 +- plugins/dynamic-security/Makefile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config.mk b/config.mk index e8be1aa1..f2520b3d 100644 --- a/config.mk +++ b/config.mk @@ -367,7 +367,7 @@ ifeq ($(WITH_CJSON),yes) CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_CJSON CLIENT_LDADD:=$(CLIENT_LDADD) -lcjson CLIENT_STATIC_LDADD:=$(CLIENT_STATIC_LDADD) -lcjson - CLIENT_LDFLAGS:=$(CLIENT_LDFLAGS) -L/usr/local/lib + CLIENT_LDFLAGS:=$(CLIENT_LDFLAGS) endif ifeq ($(WITH_XTREPORT),yes) diff --git a/plugins/dynamic-security/Makefile b/plugins/dynamic-security/Makefile index 559f531e..203fbc3e 100644 --- a/plugins/dynamic-security/Makefile +++ b/plugins/dynamic-security/Makefile @@ -4,7 +4,6 @@ include ../../config.mk PLUGIN_NAME=mosquitto_dynamic_security LOCAL_CPPFLAGS=-I../../src/ -LOCAL_LDFLAGS=-L/usr/local/lib OBJS= \ acl.o \ @@ -33,7 +32,7 @@ all : ${ALL_DEPS} binary : ${PLUGIN_NAME}.so ${PLUGIN_NAME}.so : ${OBJS} - ${CROSS_COMPILE}${CC} $(PLUGIN_LDFLAGS) $(LOCAL_LDFLAGS) -fPIC -shared $^ -o $@ -lcjson + ${CROSS_COMPILE}${CC} $(PLUGIN_LDFLAGS) -fPIC -shared $^ -o $@ -lcjson acl.o : acl.c dynamic_security.h ${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@