github
/
AROS-v0
mirror of https://github.com/deadw00d/AROS.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add ability to pass C flags specific to building modules only

This commit is contained in:
deadwood 2021-12-19 11:29:55 +01:00
parent 36d4d1afaa
commit e5c05bf815
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/make.tmpl
View File

@ -1947,8 +1947,8 @@ endif
# Default values for variables and arguments
%(mmake)_DEFLINKLIBNAME := %(modname)
%(mmake)_CFLAGS := %(cflags)
%(mmake)_CXXFLAGS := %(cxxflags)
%(mmake)_CFLAGS := %(cflags) $(MODULE_ISA_CFLAGS)
%(mmake)_CXXFLAGS := %(cxxflags) $(MODULE_ISA_CFLAGS)
ifeq (%(compiler),target)
ifeq (%(lto),yes)
%(mmake)_CFLAGS := $(strip $(LTO_BINARY_CFLAGS) $(CFLAGS_NO_STRICT_ALIASING) $(%(mmake)_CFLAGS))
@ -2411,9 +2411,9 @@ endif
%(mmake)%(flavour)_LINKLIBCPPFLAGS := $(%(mmake)%(flavour)_CPPFLAGS)
%(mmake)%(flavour)_CPPFLAGS += $(strip $($(%(mmake)%(flavour)_DEFNAME)_CPPFLAGS))
%(mmake)%(flavour)_LINKLIBCPPFLAGS += $(strip $($(%(mmake)%(flavour)_DEFNAME)_LINKLIBCPPFLAGS))
%(mmake)%(flavour)_CFLAGS := $(strip %(cflags) $($(%(mmake)%(flavour)_DEFNAME)_CFLAGS))
%(mmake)%(flavour)_CFLAGS := $(strip %(cflags) $($(%(mmake)%(flavour)_DEFNAME)_CFLAGS)) $(MODULE_ISA_CFLAGS)
%(mmake)%(flavour)_LINKLIBCFLAGS := $(strip %(cflags) $($(%(mmake)%(flavour)_DEFNAME)_LINKLIBCFLAGS))
%(mmake)%(flavour)_CXXFLAGS := $(strip %(cxxflags) $($(%(mmake)%(flavour)_DEFNAME)_CXXFLAGS))
%(mmake)%(flavour)_CXXFLAGS := $(strip %(cxxflags) $($(%(mmake)%(flavour)_DEFNAME)_CXXFLAGS)) $(MODULE_ISA_CFLAGS)
ifeq (%(compiler),target)
ifeq (%(lto),yes)
%(mmake)%(flavour)_LTOFLAGS ?= $(strip $(LTO_BINARY_CFLAGS) $(CFLAGS_NO_STRICT_ALIASING) $(NOWARN_LTO_TYPE_MISMATCH))
@ -3180,7 +3180,7 @@ $(BD_FILEOBJS$(BDID)) $(BD_LINKLIBOBJS$(BDID)) : TMP_CPPFLAGS:=$(strip %(cppflag
else
$(BD_FILEOBJS$(BDID)) $(BD_LINKLIBOBJS$(BDID)) : TMP_CPPFLAGS:=%(cppflags)
endif
$(BD_FILEOBJS$(BDID)) $(BD_LINKLIBOBJS$(BDID)) : TMP_CFLAGS:=%(cflags)
$(BD_FILEOBJS$(BDID)) $(BD_LINKLIBOBJS$(BDID)) : TMP_CFLAGS:=%(cflags) $(MODULE_ISA_CFLAGS)
ifneq (%(usesdks),)
$(BD_FILEOBJS$(BDID)) $(BD_LINKLIBOBJS$(BDID)) : TMP_CPPFLAGS:=$(TMP_CPPFLAGS) $(addprefix -I$(AROS_BUILD_SDKS)/,$(addsuffix /$(AROS_DIR_INCLUDE),%(usesdks)))
endif

2
config/target.cfg.in
View File

@ -127,6 +127,8 @@ TARGET_C_LIBS := $(strip @aros_c_libs@)
TARGET_CXX_LDFLAGS = $(strip @aros_cxx_ldflags@)
TARGET_CXX_LIBS := $(strip @aros_cxx_libs@)
MODULE_ISA_CFLAGS := $(strip @aros_module_isa_flags@)
COVERAGEINSTR_FLAGS = $(strip $(CFLAGS_PROFILE_ARCS) $(CFLAGS_TEST_COVERAGE))
COVERAGEINSTR_LIBS = gcov
FUNCINSTR_FLAGS = $(CFLAGS_INSTR_FUNCTIONS)

9
configure vendored
View File

@ -668,6 +668,7 @@ use_libatomic
crosstools_cxx_target
crosstools_target
aros_target_nostartup_objects
aros_module_isa_flags
aros_isa_flags
aros_isa_extra
aros_kernel_isa_flags
@ -8273,6 +8274,7 @@ aros_elf_translate=
aros_warn_flags=
aros_isa_extra=
aros_isa_flags=
aros_module_isa_flags=
aros_kernel_isaflags=
aros_config_cppflags=
aros_config_cflags=
@ -16512,6 +16514,10 @@ aros_kernel_ranlib=$aros_kernel_ranlib
@ -16538,9 +16544,6 @@ aros_kernel_ranlib=$aros_kernel_ranlib
# Palm native version related

2
configure.in
View File

@ -798,6 +798,7 @@ aros_elf_translate=
aros_warn_flags=
aros_isa_extra=
aros_isa_flags=
aros_module_isa_flags=
aros_kernel_isaflags=
aros_config_cppflags=
aros_config_cflags=
@ -3480,6 +3481,7 @@ AC_SUBST(aros_optimization_cflags)
AC_SUBST(aros_kernel_isa_flags)
AC_SUBST(aros_isa_extra)
AC_SUBST(aros_isa_flags)
AC_SUBST(aros_module_isa_flags)
AC_SUBST(aros_target_nostartup_objects)