From 17c955a7cdf0361e5662b38eec0a2b00b3753074 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Wed, 1 Jun 2022 08:19:43 +0000 Subject: [PATCH] - permit CFLAGS, CXXFLAGS, LDFLAGS to be set in Makefile git-svn-id: http://moon:8086/svn/software/trunk/make@906 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- compile.mk | 8 ++++---- link.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compile.mk b/compile.mk index 5c2902e..2b35de2 100644 --- a/compile.mk +++ b/compile.mk @@ -1,9 +1,9 @@ -CXXFLAGS_debug := -g -O0 -CXXFLAGS_release := -O2 +CXXFLAGS_debug += -g -O0 +CXXFLAGS_release += -O2 CXXFLAGS += ${CXXFLAGS_${CONFIG}} -CFLAGS_debug := -g -O0 -CFLAGS_release :=- O2 +CFLAGS_debug += -g -O0 +CFLAGS_release +=- O2 CFLAGS += ${CFLAGS_${CONFIG}} CXX_OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(CXX_SRCS))) diff --git a/link.mk b/link.mk index 98d1660..1c22227 100644 --- a/link.mk +++ b/link.mk @@ -1,7 +1,7 @@ -include $(DEPS) -LDFLAGS_release := -LDFLAGS_debug := -g +LDFLAGS_release += +LDFLAGS_debug += -g LDFLAGS += ${LFLAGS_${CONFIG}} ${BUILD_DIR}/${TARGET}: ${OBJS} $(BUILD_DIR)