diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-07 17:13:26 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-08 11:27:48 +0200 |
| commit | a149454c79b62c4bf1c87db44138d27b4bcdab77 (patch) | |
| tree | 97a767d6275cc0f5ad35779acea83381157fcaeb /solenv | |
| parent | 0cd589cb5f57242b320530920db33b720110d619 (diff) | |
gbuild: fix CFLAGS/CXXFLAGS:
GNU coding standards say that user should be able to override the build
system's default flags with CFLAGS/CXXFLAGS environment vars;
also these ended up twice on the command line due to historic accident.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 8 |
2 files changed, 4 insertions, 11 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index b71a13b2d1b5..7d126fd7f52a 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -52,9 +52,10 @@ gb_LinkTarget__get_symbolscflags= gb_LinkTarget__get_symbolscxxflags= endif -# generic cflags/cxxflags to use (optimization flags, symbols (i.e. debug) flags, flags from environment) -gb_LinkTarget__get_cflags=$(gb_COMPILEROPTFLAGS) $(call gb_LinkTarget__get_symbolscflags,$(1)) $(CFLAGS) -gb_LinkTarget__get_cxxflags=$(gb_COMPILEROPTFLAGS) $(call gb_LinkTarget__get_symbolscxxflags,$(1)) $(CXXFLAGS) +# generic cflags/cxxflags to use (optimization flags, debug flags) +# user supplied CFLAGS/CXXFLAGS override default debug/optimization flags +gb_LinkTarget__get_cflags=$(if $(CFLAGS),$(CFLAGS),$(gb_COMPILEROPTFLAGS) $(call gb_LinkTarget__get_symbolscflags,$(1))) +gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(gb_COMPILEROPTFLAGS) $(call gb_LinkTarget__get_symbolscxxflags,$(1))) # Overview of dependencies and tasks of LinkTarget # diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 8403685438ce..9d3ed3a37205 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -153,22 +153,14 @@ endif endif # save user-supplied flags for latter use -ifneq ($(strip $(CFLAGS)),) -gb__ENV_CFLAGS := $(CFLAGS) -else # TODO remove after the old build system is abolished ifneq ($(strip $(ENVCFLAGS)),) gb__ENV_CFLAGS := $(ENVCFLAGS) endif -endif -ifneq ($(strip $(CXXFLAGS)),) -gb__ENV_CXXFLAGS := $(CXXFLAGS) -else # TODO remove after the old build system is abolished ifneq ($(strip $(ENVCFLAGSCXX)),) gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX) endif -endif include $(GBUILDDIR)/Helper.mk include $(GBUILDDIR)/TargetLocations.mk |