[llvm-commits] CVS: llvm/tools/llvm-config/llvm-config.in.in

[Reid Spencer]

Changes in directory llvm/tools/llvm-config:

llvm-config.in.in updated: 1.19 -> 1.20
---
Log message:

Fix a typo in the name of expand_dependencies. 
Make the dependency line pattern match handle white space better.


---
Diffs of the changes:  (+4 -4)

 llvm-config.in.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/tools/llvm-config/llvm-config.in.in
diff -u llvm/tools/llvm-config/llvm-config.in.in:1.19 llvm/tools/llvm-config/llvm-config.in.in:1.20
--- llvm/tools/llvm-config/llvm-config.in.in:1.19	Thu Jul 27 18:00:30 2006
+++ llvm/tools/llvm-config/llvm-config.in.in	Thu Aug  3 16:45:35 2006
@@ -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);