aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2011-12-12 22:45:41 +0000
committerDaniel Dunbar <daniel@zuster.org>2011-12-12 22:45:41 +0000
commit54d8c7fc0359cf9a0b857d27ea6816ea6b050281 (patch)
tree0bbfe29480ccdeee7add881d0a03e840b1633f26
parenta3217165c6d2ef7caf58665eb0a61c64ab229b9f (diff)
downloadexternal_llvm-54d8c7fc0359cf9a0b857d27ea6816ea6b050281.zip
external_llvm-54d8c7fc0359cf9a0b857d27ea6816ea6b050281.tar.gz
external_llvm-54d8c7fc0359cf9a0b857d27ea6816ea6b050281.tar.bz2
llvm-build: Don't write out the required_libraries list for "special" components, it is generated.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146435 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--utils/llvm-build/llvmbuild/componentinfo.py6
-rw-r--r--utils/llvm-build/llvmbuild/main.py1
2 files changed, 6 insertions, 1 deletions
diff --git a/utils/llvm-build/llvmbuild/componentinfo.py b/utils/llvm-build/llvmbuild/componentinfo.py
index e9ef973..8526461 100644
--- a/utils/llvm-build/llvmbuild/componentinfo.py
+++ b/utils/llvm-build/llvmbuild/componentinfo.py
@@ -45,6 +45,10 @@ class ComponentInfo(object):
# The original source path.
self._source_path = None
+ # A flag to mark "special" components which have some amount of magic
+ # handling (generally based on command line options).
+ self._is_special_group = False
+
def set_parent_instance(self, parent):
assert parent.name == self.parent, "Unexpected parent!"
self.parent_instance = parent
@@ -197,7 +201,7 @@ class LibraryGroupComponentInfo(ComponentInfo):
print >>result, 'type = %s' % self.type_name
print >>result, 'name = %s' % self.name
print >>result, 'parent = %s' % self.parent
- if self.required_libraries:
+ if self.required_libraries and not self._is_special_group:
print >>result, 'required_libraries = %s' % ' '.join(
self.required_libraries)
if self.add_to_library_groups:
diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
index 71e11d7..550c740 100644
--- a/utils/llvm-build/llvmbuild/main.py
+++ b/utils/llvm-build/llvmbuild/main.py
@@ -666,6 +666,7 @@ def add_magic_target_components(parser, project, opts):
fatal("special component %r must have empty %r list" % (
name, 'add_to_library_groups'))
+ info._is_special_group = True
return info
info_map = dict((ci.name, ci) for ci in project.component_infos)