From af98062cd0e3b762c3dc037cc2f001980299591b Mon Sep 17 00:00:00 2001 From: NicJA Date: Fri, 24 Mar 2017 03:24:53 +0000 Subject: [PATCH] use the $(OPTIMIZATION_CFLAGS) as the default extrac/xxflags so they are easily overridden. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@54250 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- config/make.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/make.tmpl b/config/make.tmpl index 20495334b3..c9d842e2d4 100644 --- a/config/make.tmpl +++ b/config/make.tmpl @@ -2798,7 +2798,7 @@ DEPS := $(DEPS) $(STUBS_DEP) # %define build_with_configure mmake=/A package= srcdir=$(SRCDIR)/$(CURDIR) gendir= prefix= \ - aros_prefix= extraoptions= extracflags= extracxxflags= nix_dir_layout= nix=no compiler=target \ + aros_prefix= extraoptions= extracflags=$(OPTIMIZATION_CFLAGS) extracxxflags=$(OPTIMIZATION_CFLAGS) nix_dir_layout= nix=no compiler=target \ install_target=install preconfigure= postconfigure= postinstall= \ config_env_extra= install_env= use_build_env=no gnuflags=yes @@ -2923,9 +2923,9 @@ ifeq (%(compiler),target) CPP="$(TARGET_CPP) $(TARGET_SYSROOT)" \ CXXCPP="$(TARGET_CPP) $(TARGET_SYSROOT)" \ CC="$(TARGET_CC) $(TARGET_SYSROOT)" \ - CFLAGS="$(USER_INCLUDES) $(BASE_CFLAGS) $(OPTIMIZATION_CFLAGS) $(USER_CFLAGS) %(extracflags) $(%(mmake)-nix) $(%(mmake)-s_flag)" \ + CFLAGS="$(USER_INCLUDES) $(BASE_CFLAGS) $(USER_CFLAGS) %(extracflags) $(%(mmake)-nix) $(%(mmake)-s_flag)" \ CXX="$(TARGET_CXX) $(TARGET_SYSROOT)" \ - CXXFLAGS="$(TARGET_CXXFLAGS) $(DEBUG_CFLAGS) $(OPTIMIZATION_CFLAGS) %(extracxxflags) $(ISA_FLAGS) $(%(mmake)-nix) $(%(mmake)-s_flag)" \ + CXXFLAGS="$(TARGET_CXXFLAGS) $(DEBUG_CFLAGS) %(extracxxflags) $(ISA_FLAGS) $(%(mmake)-nix) $(%(mmake)-s_flag)" \ LDFLAGS="-L$(AROS_DEVELOPMENT)/lib $(USER_LDFLAGS) $(%(mmake)-nix) $(%(mmake)-s_flag)" \ AS="$(TARGET_AS)" \ CC_FOR_BUILD="$(HOST_DEF_CC)" \ @@ -2945,9 +2945,9 @@ ifeq (%(compiler),target) TARGET_STRIP="$(STRIP_PLAIN)" \ TARGET_NM="$(NM_PLAIN)" \ CC_FOR_TARGET="$(TARGET_CC) $(TARGET_SYSROOT)" \ - CFLAGS_FOR_TARGET="$(USER_INCLUDES) $(BASE_CFLAGS) $(OPTIMIZATION_CFLAGS) -L$(AROS_DEVELOPMENT)/lib %(extracflags) $(%(mmake)-nix) $(%(mmake)-s_flag)" \ + CFLAGS_FOR_TARGET="$(USER_INCLUDES) $(BASE_CFLAGS) -L$(AROS_DEVELOPMENT)/lib %(extracflags) $(%(mmake)-nix) $(%(mmake)-s_flag)" \ CXX_FOR_TARGET="$(TARGET_CXX) $(TARGET_SYSROOT)" \ - CXXFLAGS_FOR_TARGET="$(TARGET_CXXFLAGS) $(DEBUG_CFLAGS) $(OPTIMIZATION_CFLAGS) -L$(AROS_DEVELOPMENT)/lib %(extracxxflags) $(ISA_FLAGS) $(%(mmake)-nix) $(%(mmake)-s_flag)" + CXXFLAGS_FOR_TARGET="$(TARGET_CXXFLAGS) $(DEBUG_CFLAGS) -L$(AROS_DEVELOPMENT)/lib %(extracxxflags) $(ISA_FLAGS) $(%(mmake)-nix) $(%(mmake)-s_flag)" ifeq (%(gnuflags),yes) %(mmake)-config_opts += --build=$(AROS_HOST_CPU)-$(AROS_HOST_ARCH)\ --host=$(AROS_TARGET_CPU)-aros\ -- 2.11.4.GIT