Commit 34d07fe5 authored by Ben Walker's avatar Ben Walker Committed by Konrad Sztyber
Browse files

build: Correctly include CFLAGS during link 



Change-Id: I44e3708f87b15a55654ab7e5d4a2edbca8475c92
Signed-off-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21958


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent aec2e33b

mk/spdk.common.mk

+3 −3
Original line number Diff line number Diff line
@@ -388,15 +388,15 @@ ENV_LDFLAGS = $(if $(SPDK_NO_LINK_ENV),,$(ENV_LINKER_ARGS)) 
# Link $(OBJS) and $(LIBS) into $@ (app)

LINK_C=\

	$(Q)echo "  LINK $(notdir $@)"; \

	$(CC) -o $@ $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(ENV_LDFLAGS) $(SYS_LIBS)

	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(ENV_LDFLAGS) $(SYS_LIBS)



LINK_CXX=\

	$(Q)echo "  LINK $(notdir $@)"; \

	$(CXX) -o $@ $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(ENV_LDFLAGS) $(SYS_LIBS)

	$(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $(ENV_LDFLAGS) $(SYS_LIBS)



# Provide function to ease build of a shared lib

define spdk_build_realname_shared_lib

	$(1) -o $@ -shared $(CPPFLAGS) $(LDFLAGS) \

	$(1) -o $@ -shared $(CFLAGS) $(LDFLAGS) \

	    -Wl,-rpath=$(DESTDIR)/$(libdir) \

	    -Wl,--soname,$(notdir $@) \

	    -Wl,--whole-archive $(2) -Wl,--no-whole-archive \