diff options
| -rw-r--r-- | tools/llvm-config/Makefile | 2 | ||||
| -rwxr-xr-x | tools/llvm-config/find-cycles.pl | 2 | ||||
| -rw-r--r-- | tools/llvm-config/llvm-config.in.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile index f8042333d8..64abfa186c 100644 --- a/tools/llvm-config/Makefile +++ b/tools/llvm-config/Makefile @@ -33,7 +33,7 @@ GenLibDeps = $(PROJ_SRC_ROOT)/utils/GenLibDeps.pl $(LibDeps): $(GenLibDeps) $(LibDir) $(wildcard $(LibDir)/*.a $(LibDir)/*.o) $(Echo) "Regenerating LibDeps.txt" - $(Verb) $(GenLibDeps) -flat $(LibDir) $(NM_PATH) | sort > $(LibDeps) + $(Verb) $(GenLibDeps) -flat $(LibDir) $(NM_PATH) # Find all the cyclic dependencies between various LLVM libraries, so we # don't have to process them at runtime. diff --git a/tools/llvm-config/find-cycles.pl b/tools/llvm-config/find-cycles.pl index 5f62034bb2..8d6b0bb1db 100755 --- a/tools/llvm-config/find-cycles.pl +++ b/tools/llvm-config/find-cycles.pl @@ -29,7 +29,7 @@ sub find_all_cycles; # Read our dependency information. while (<>) { chomp; - my ($module, $dependency_str) = /^([^:]*): ?(.*)$/; + my ($module, $dependency_str) = /^\s*([^:]+):\s*(.*)\s*$/; die "Malformed data: $_" unless defined $dependency_str; my @dependencies = split(/ /, $dependency_str); $DEPS{$module} = \@dependencies; diff --git a/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in index 403e67abb9..a8c0fa3ed1 100644 --- a/tools/llvm-config/llvm-config.in.in +++ b/tools/llvm-config/llvm-config.in.in @@ -275,7 +275,7 @@ sub load_dependencies { $DEPENDENCIES_LOADED = 1; while (<DATA>) { # Parse our line. - my ($libs, $deps) = /^\s*([^:]+):\s+(.*)\s*$/; + my ($libs, $deps) = /^\s*([^:]+):\s*(.*)\s*$/; die "Malformed dependency data" unless defined $deps; my @libs = split(' ', $libs); my @deps = split(' ', $deps); |