diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-11-24 12:45:57 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-11-24 12:53:04 +0100 |
| commit | 3deee910ab4304ff72846db91d90826f731c2544 (patch) | |
| tree | 3b6a74f9baf75e63da6811c9d8f0edca6e8cbf9a /solenv | |
| parent | 665d085511a64959ceafd869e6331877ed711c80 (diff) | |
gbuild: handle GENCXXCLROBJECTS in gbuildtojson
Change-Id: Ib5808a715e4ba0e0a5d9eea8260ea72fd85ccda2
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 5 | ||||
| -rw-r--r-- | solenv/qa/python/gbuildtojson.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index e2da5726479d..6ffdfa2ee546 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -60,6 +60,7 @@ $(call gb_Executable_get_command,gbuildtojson) \ --lexobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(LEXOBJECTS)) \ --gencobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(GENCOBJECTS)) \ --gencxxobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(GENCXXOBJECTS)) \ +--gencxxclrobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(GENCXXCLROBJECTS)) \ --cobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(COBJECTS)) \ --javaobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(JAVAOBJECTS)) \ --pythonobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(PYTHONOBJECTS)) \ @@ -114,6 +115,10 @@ define gb_LinkTarget_add_generated_cxx_object $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2) endef +define gb_LinkTarget_add_generated_cxxclrobject +$(call gb_LinkTarget_get_target,$(1)) : GENCXXCLROBJECTS += $(2) + +endef define gb_LinkTarget_add_objcobject $(call gb_LinkTarget_get_target,$(1)) : OBJCOBJECTS += $(2) diff --git a/solenv/qa/python/gbuildtojson.py b/solenv/qa/python/gbuildtojson.py index 98c49ebb8d70..5166be353f9e 100644 --- a/solenv/qa/python/gbuildtojson.py +++ b/solenv/qa/python/gbuildtojson.py @@ -62,7 +62,7 @@ class CheckGbuildToJson(unittest.TestCase): gbuildlibs.append(json.load(f)) foundlibs = set() for lib in gbuildlibs: - self.assertEqual(set(lib.keys()), set(['MAKEFILE', 'ASMOBJECTS', 'CFLAGS', 'CFLAGSAPPEND', 'COBJECTS', 'CXXCLRFLAGS', 'CXXCLRFLAGSAPPEND', 'CXXCLROBJECTS', 'CXXFLAGS', 'CXXFLAGSAPPEND', 'CXXOBJECTS', 'DEFS', 'LEXOBJECTS', 'GENCOBJECTS', 'GENCXXOBJECTS', 'ILIBTARGET', 'INCLUDE', 'JAVAOBJECTS', 'LINKED_LIBS', 'LINKED_STATIC_LIBS', 'LINKTARGET', 'OBJCFLAGS', 'OBJCFLAGSAPPEND', 'OBJCOBJECTS', 'OBJCXXFLAGS', 'OBJCXXFLAGSAPPEND', 'OBJCXXOBJECTS', 'PYTHONOBJECTS', 'YACCOBJECTS'])) + self.assertEqual(set(lib.keys()), set(['MAKEFILE', 'ASMOBJECTS', 'CFLAGS', 'CFLAGSAPPEND', 'COBJECTS', 'CXXCLRFLAGS', 'CXXCLRFLAGSAPPEND', 'CXXCLROBJECTS', 'CXXFLAGS', 'CXXFLAGSAPPEND', 'CXXOBJECTS', 'DEFS', 'LEXOBJECTS', 'GENCOBJECTS', 'GENCXXOBJECTS', 'GENCXXCLROBJECTS', 'ILIBTARGET', 'INCLUDE', 'JAVAOBJECTS', 'LINKED_LIBS', 'LINKED_STATIC_LIBS', 'LINKTARGET', 'OBJCFLAGS', 'OBJCFLAGSAPPEND', 'OBJCOBJECTS', 'OBJCXXFLAGS', 'OBJCXXFLAGSAPPEND', 'OBJCXXOBJECTS', 'PYTHONOBJECTS', 'YACCOBJECTS'])) if lib['LINKTARGET'].find('gbuildselftestdep') != -1: foundlibs.add('gbuildselftestdep') elif lib['LINKTARGET'].find('gbuildselftest') != -1: |