From eba54c2ad4333b5e7ff0b7c5e1cee90c982c60fa Mon Sep 17 00:00:00 2001 From: Herrie Date: Mon, 26 Aug 2019 13:19:38 +0000 Subject: [PATCH] Makefile: Allow use of CC & LDFLAGS defined by build system. When building within Yocto projects such as LuneOS, we want to use CC & LDFLAGS provided by the build toolchain. Signed-off-by: Herman van Hazendonk github.com@herrie.org Signed-off-by: Christophe Chapuis chris.chapuis@gmail.com --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e9d6e75..8ce4f67 100644 --- a/Makefile +++ b/Makefile @@ -63,14 +63,17 @@ RELEASE_BUILD_DIR = $(BUILD_DIR)/release # Tools and flags # +ifndef CC CC = $(CROSS_COMPILE)gcc +endif + LD = $(CC) WARNINGS = -Wall -Wno-unused-parameter -Wno-multichar INCLUDES = -I$(INCLUDE_DIR) -I$(GEN_DIR) BASE_FLAGS = -fPIC $(CFLAGS) FULL_CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \ $(shell pkg-config --cflags $(PKGS)) -LDFLAGS = $(BASE_FLAGS) -shared -Wl,-soname -Wl,$(LIB_SONAME) \ +FULL_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS) -shared -Wl,-soname -Wl,$(LIB_SONAME) $(shell pkg-config --libs $(PKGS)) DEBUG_FLAGS = -g RELEASE_FLAGS = @@ -85,8 +88,8 @@ endif DEBUG_CFLAGS = $(FULL_CFLAGS) $(DEBUG_FLAGS) -DDEBUG RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS) -O2 -DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS) -RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS) +DEBUG_LDFLAGS = $(FULL_LDFLAGS) $(DEBUG_FLAGS) +RELEASE_LDFLAGS = $(FULL_LDFLAGS) $(RELEASE_FLAGS) # # Files