aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2006-08-03 21:45:35 +0000
committerReid Spencer <rspencer@reidspencer.com>2006-08-03 21:45:35 +0000
commitd8c20a9cf89b34be0b2a500ee76ce3faedf1184e (patch)
tree7a6a8c851fedebeb788cb837b53974af3389ac08
parent8cfe6335e40a1190e96e470b35a760a2bad7f650 (diff)
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
-rw-r--r--tools/llvm-config/llvm-config.in.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in
index 0b30f9081a..403e67abb9 100644
--- a/tools/llvm-config/llvm-config.in.in
+++ b/tools/llvm-config/llvm-config.in.in
@@ -84,7 +84,7 @@ if ($ABS_RUN_DIR eq $ABS_OBJ_ROOT) {
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 @@ if (@components == 0) {
# 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 @@ my $DEPENDENCIES_LOADED = 0;
# 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 @@ sub load_dependencies {
$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);