janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

make: Modify only BUILD_*FLAGS in jw-build/make/*.mk

Browse source 
Assign only to BUILD_XXXFLAGS in jw-build/make/*.mk, and leave PROJECT_XXXFLAGS
and LOCAL_XXXFLAGS alone.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-04-10 06:43:40 +00:00
commit 49f269bdfe
12 changed files with 74 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

71
make/defs-cpp.mk
View file

@ -142,15 +142,15 @@ ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling
TC_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32-
endif
PROJECT_CPPFLAGS += -D_WINDOWS
BUILD_CPPFLAGS += -D_WINDOWS
BUILD_LDFLAGS += -lws2_32
WINDRES ?= $(TC_BIN_PREFIX)windres
USE_GFILTER ?= false
MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE
endif
#PROJECT_CPPFLAGS += -I$(TC_SYS_ROOT)/include
#PROJECT_LDFLAGS += -L$(TC_SYS_ROOT)/lib
#BUILD_CPPFLAGS += -I$(TC_SYS_ROOT)/include
#BUILD_LDFLAGS += -L$(TC_SYS_ROOT)/lib
else # we're not cross-compiling
@ -249,8 +249,8 @@ BUILD_CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -W
BUILD_LDFLAGS += -Wall
ifeq ($(TARGET_ARCH),$(ARCH_32))
PROJECT_CPPFLAGS += -m32
PROJECT_LDFLAGS += -m32
BUILD_CPPFLAGS += -m32
BUILD_LDFLAGS += -m32
endif
ifneq ($(findstring $(TARGET_ARCH),$(INTEL_ARCHS)),)
@ -265,9 +265,9 @@ ifneq ($(findstring $(TARGET_ARCH),$(INTEL_ARCHS)),)
endif
ifeq ($(TARGET_ARCH),armv7hl)
PROJECT_CPPFLAGS += -fPIC
BUILD_CPPFLAGS += -fPIC
else ifeq ($(TARGET_ARCH),aarch64)
PROJECT_CPPFLAGS += -fPIC
BUILD_CPPFLAGS += -fPIC
endif
ifeq ($(DEVELOPMENT),true)
@ -278,7 +278,7 @@ ifeq ($(DEVELOPMENT),true)
endif
ifneq ($(LOG_QUAL_PREFIX),)
PROJECT_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\"
BUILD_CPPFLAGS += -DKEEP_FILES_OPEN -DLOG_QUAL_PREFIX=\"$(LOG_QUAL_PREFIX)\"
endif
ifeq ($(CATCH_ONLY_YERROR),true)
@ -292,47 +292,47 @@ endif
ifeq ($(TARGET_TRIPLET),arm-none-eabi)
ifeq ($(TARGET_CPU),cortex-m3)
PROJECT_CPPFLAGS += -mcpu=cortex-m3 -mthumb
PROJECT_LDFLAGS += -mcpu=cortex-m3 -mthumb
BUILD_CPPFLAGS += -mcpu=cortex-m3 -mthumb
BUILD_LDFLAGS += -mcpu=cortex-m3 -mthumb
else ifeq ($(TARGET_CPU),cortex-m4)
PROJECT_CPPFLAGS += -mcpu=cortex-m4 -mthumb
PROJECT_LDFLAGS += -mcpu=cortex-m4 -mthumb
BUILD_CPPFLAGS += -mcpu=cortex-m4 -mthumb
BUILD_LDFLAGS += -mcpu=cortex-m4 -mthumb
else ifeq ($(TARGET_CPU),cortex-m7)
PROJECT_CPPFLAGS += -mcpu=cortex-m7 -mthumb
PROJECT_LDFLAGS += -mcpu=cortex-m7 -mthumb
BUILD_CPPFLAGS += -mcpu=cortex-m7 -mthumb
BUILD_LDFLAGS += -mcpu=cortex-m7 -mthumb
endif
ifneq ($(findstring cortex-m,$(TARGET_CPU)),)
# don't wrap error message lines
#PROJECT_LDFLAGS += -fmessage-length=0
#BUILD_LDFLAGS += -fmessage-length=0
# don't know what kind of optimization that is
#PROJECT_LDFLAGS += -Og
#BUILD_LDFLAGS += -Og
# stick with what janware code tends to expect
PROJECT_LDFLAGS += -fsigned-char
BUILD_LDFLAGS += -fsigned-char
# I have no clue which part would evaluate these names
PROJECT_LDFLAGS += -ffunction-sections
PROJECT_LDFLAGS += -fdata-sections
PROJECT_LDFLAGS += -ffreestanding
PROJECT_LDFLAGS += -fno-move-loop-invariants
BUILD_LDFLAGS += -ffunction-sections
BUILD_LDFLAGS += -fdata-sections
BUILD_LDFLAGS += -ffreestanding
BUILD_LDFLAGS += -fno-move-loop-invariants
# skip any automatic initialization
PROJECT_LDFLAGS += -nostartfiles
BUILD_LDFLAGS += -nostartfiles
# garbage collect unused input sections
PROJECT_LDFLAGS += -Xlinker --gc-sections
#PROJECT_LDFLAGS += -Xlinker --print-gc-sections
BUILD_LDFLAGS += -Xlinker --gc-sections
#BUILD_LDFLAGS += -Xlinker --print-gc-sections
# create map file
PROJECT_LDFLAGS += -Wl,-Map,"$(EXE_MAP)"
BUILD_LDFLAGS += -Wl,-Map,"$(EXE_MAP)"
# use newlib-nano, provides symbols _write _close _fstat _isatty _lseek (at least)
# (TODO: No -Wl necessary?)
PROJECT_LDFLAGS += --specs=nano.specs
PROJECT_LDFLAGS += --specs=nosys.specs
BUILD_LDFLAGS += --specs=nano.specs
BUILD_LDFLAGS += --specs=nosys.specs
endif
@ -413,7 +413,7 @@ ifeq ($(TARGET_TRIPLET),arm-none-eabi)
endif
PROJECT_LDFLAGS += $(addprefix -u ,$(LD_DEFINE_SYMBOLS))
BUILD_LDFLAGS += $(addprefix -u ,$(LD_DEFINE_SYMBOLS))
# -- target files and dirs
@ -661,21 +661,21 @@ ifeq ($(STRIP_SYMBOLS),true)
STRIP_DONE ?= strip.done
endif
BUILD_INCLUDE += $(LOCAL_INCLUDE)
BUILD_INCLUDE += $(LOCAL_INCLUDE)
# force use of double quotes, allow header namespaces
ifeq ($(HDRDIR_SCOPE_SUFFIX),)
BUILD_INCLUDE += -I.
BUILD_INCLUDE += -I.
else
BUILD_INCLUDE += -iquote .
BUILD_INCLUDE += -iquote .
endif
ifeq ($(USE_PROJECT_LIB),true)
BUILD_INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include
BUILD_INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include
BUILD_LIBFLAGS += -L$(BUILD_LIBDIR)
endif
BUILD_INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT))
BUILD_INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT))
LDFLAGS_QUERY_ARGS = $(addprefix --exclude ,$(LDFLAGS_EXCLUDE))
BUILD_LIBFLAGS += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) --add-self $(PREREQ_BUILD))
@ -695,7 +695,7 @@ ifeq ($(USE_FFTW),true)
endif
ifeq ($(USE_GLIB),true)
PROJECT_CPPFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0)
BUILD_CPPFLAGS += $(shell $(PKG_CONFIG_EXE) --cflags glib-2.0)
BUILD_LIBFLAGS += $(shell $(PKG_CONFIG_EXE) --libs glib-2.0)
endif
@ -714,9 +714,10 @@ ifeq ($(CC),$(GCC))
endif
BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS) $(BUILD_INCLUDE)
BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(BUILD_INCLUDE)
BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_INCLUDE) $(PROJECT_CPPFLAGS) $(COMPILER_CPPFLAGS) $(BUILD_INCLUDE)
BUILD_CXXFLAGS += $(LOCAL_CXXFLAGS) $(PROJECT_CXXFLAGS) $(COMPILER_CXXFLAGS) $(BUILD_INCLUDE)
BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(COMPILER_LDFLAGS) $(BUILD_LPPFLAGS) $(BUILD_LIBFLAGS)
#RPM_REQUIRES = $(shell $(ECHO) "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix))
RPM_REQUIRES += $(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)