Fix a typo in the name of expand_dependencies.
Make the dependency line pattern match handle white space better.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29516 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in
index 0b30f90..403e67a 100644
--- a/tools/llvm-config/llvm-config.in.in
+++ b/tools/llvm-config/llvm-config.in.in
@@ -84,7 +84,7 @@
sub usage;
sub fix_library_names (@);
sub fix_library_files (@);
-sub expand_dependecies (@);
+sub expand_dependencies (@);
sub name_map_entries;
# Parse our command-line arguments.
@@ -145,7 +145,7 @@
# Handle any arguments which require building our dependency graph.
if ($want_libs || $want_libnames || $want_libfiles) {
- my @libs = expand_dependecies(@components);
+ my @libs = expand_dependencies(@components);
print join(' ', fix_library_names(@libs)), "\n" if ($want_libs);
print join(' ', @libs), "\n" if ($want_libnames);
print join(' ', fix_library_files(@libs)), "\n" if ($want_libfiles);
@@ -257,7 +257,7 @@
# Given a list of human-friendly component names, translate them into a
# complete set of linker arguments.
-sub expand_dependecies (@) {
+sub expand_dependencies (@) {
my @libs = @_;
load_dependencies;
my @required_sets = find_all_required_sets(expand_names(@libs));
@@ -275,7 +275,7 @@
$DEPENDENCIES_LOADED = 1;
while (<DATA>) {
# Parse our line.
- my ($libs, $deps) = /^(^[^:]+): ?(.*)$/;
+ my ($libs, $deps) = /^\s*([^:]+):\s+(.*)\s*$/;
die "Malformed dependency data" unless defined $deps;
my @libs = split(' ', $libs);
my @deps = split(' ', $deps);