From ce60297bdad8c68bf6a3abe56e64c6553431848b Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Thu, 23 Jun 2016 09:29:22 -0700 Subject: [PATCH] build: move -lrt to a new SYS_LIBS variable On some platforms, librt may be a static library, so linker command line order matters. Create a new Makefile variable, SYS_LIBS, which is added to the end of all link commands and move -lrt there. Change-Id: Ie28ebd91a255097bf33cbcf9f0f74f7177a0b142 Signed-off-by: Daniel Verkamp --- mk/spdk.common.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk index 7ab2c5df7..90e30b2b4 100644 --- a/mk/spdk.common.mk +++ b/mk/spdk.common.mk @@ -105,7 +105,9 @@ LDFLAGS += -fsanitize=address endif COMMON_CFLAGS += -pthread -LDFLAGS += -pthread -lrt +LDFLAGS += -pthread + +SYS_LIBS += -lrt MAKEFLAGS += --no-print-directory @@ -127,11 +129,11 @@ COMPILE_CXX=\ # Link $(OBJS) and $(LIBS) into $@ (app) LINK_C=\ $(Q)echo " LINK $S/$@"; \ - $(CC) -o $@ $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) + $(CC) -o $@ $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(SYS_LIBS) LINK_CXX=\ $(Q)echo " LINK $S/$@"; \ - $(CXX) -o $@ $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) + $(CXX) -o $@ $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(SYS_LIBS) # Archive $(OBJS) into $@ (.a) LIB_C=\