diff options
| -rw-r--r-- | makefiles/Makefile.tools | 3 | ||||
| -rw-r--r-- | makefiles/Makefile.top | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index a795744..0747062 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -150,9 +150,6 @@ ifeq ($(COMPONENT_TYPE),lib-shared) # Default CFLAGS/LDFLAGS for shared libraries SHAREDCFLAGS ?= -fPIC -DPIC SHAREDLDFLAGS ?= -shared - - CFLAGS := $(CFLAGS) $(SHAREDCFLAGS) - LDFLAGS := $(LDFLAGS) $(SHAREDLDFLAGS) endif ############################################################################### diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top index 1bb97dd..74fad73 100644 --- a/makefiles/Makefile.top +++ b/makefiles/Makefile.top @@ -259,7 +259,7 @@ ifeq ($(COMPONENT_TYPE),lib-static) $(Q)$(AR) $(ARFLAGS) $@ $(OBJECTS) else $(VQ)$(ECHO) $(ECHOFLAGS) " LINK: $@" - $(Q)$(CC) -o $@ $(OBJECTS) $(LDFLAGS) + $(Q)$(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(SHAREDLDFLAGS) endif ############################################################################### @@ -306,13 +306,15 @@ else endef endif +BUILDCFLAGS = $(CFLAGS) $(SHAREDCFLAGS) + # Generate dependency rules $(eval $(foreach SOURCE,$(filter %.c,$(SOURCES)), \ - $(call dep_c,$(SOURCE),$(subst /,_,$(SOURCE:.c=.d)),CFLAGS))) + $(call dep_c,$(SOURCE),$(subst /,_,$(SOURCE:.c=.d)),BUILDCFLAGS))) # Generate compilation rules $(eval $(foreach SOURCE,$(filter %.c,$(SOURCES)), \ - $(call build_c,$(SOURCE),$(subst /,_,$(SOURCE:.c=.o)),CFLAGS))) + $(call build_c,$(SOURCE),$(subst /,_,$(SOURCE:.c=.o)),BUILDCFLAGS))) # Similarly for test sources ifeq ($(MAKECMDGOALS),test) |