[PATCH] Remove obsolete user-supplied flags

[Chris Sherlock (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3172

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/3172/1

Remove obsolete user-supplied flags

Fix TODO - now that we have migrated to gbuild, there is no more need
for these options in gbuild.mk.

Change-Id: I418f183295bb283cf3d56b98936e707f6836d18f
---
M solenv/gbuild/gbuild.mk
1 file changed, 0 insertions(+), 18 deletions(-)



diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 3cc234e..81f5b04 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -171,16 +171,6 @@
 gb_QUIET_EXTERNAL := $(true)
 endif
 
-# save user-supplied flags for latter use
-# TODO remove after the old build system is abolished
-ifneq ($(strip $(ENVCFLAGS)),)
-gb__ENV_CFLAGS := $(ENVCFLAGS)
-endif
-# TODO remove after the old build system is abolished
-ifneq ($(strip $(ENVCFLAGSCXX)),)
-gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
-endif
-
 include $(GBUILDDIR)/ExternalExecutable.mk
 include $(GBUILDDIR)/TargetLocations.mk
 include $(GBUILDDIR)/Tempfile.mk
@@ -199,14 +189,6 @@
 
 # after platform; at least currently python depends on variable set in platform
 $(eval $(call gb_ExternalExecutable_collect_registrations))
-
-# add user-supplied flags
-ifneq ($(strip gb__ENV_CFLAGS),)
-gb_LinkTarget_CFLAGS += $(gb__ENV_CFLAGS)
-endif
-ifneq ($(strip gb__ENV_CXXFLAGS),)
-gb_LinkTarget_CXXFLAGS += $(gb__ENV_CXXFLAGS)
-endif
 
 gb_CPUDEFS += -D$(CPUNAME)
 

-- 
To view, visit https://gerrit.libreoffice.org/3172
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I418f183295bb283cf3d56b98936e707f6836d18f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock <chris.sherlock79 at gmail.com>