Removed usage of "sort", which can lead to undeterministic behavior on mingw & cygwin...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29532 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
index f8042333d87c43fbc5263a3f4e07bcf89751b9b7..64abfa186c011eafd7671c3a32569a1f60c82f26 100644 (file)
--- 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 5f62034bb2a1f343cb39328519a0c1898ef0c92f..8d6b0bb1dbbdd71ec887d8deb80ff2dac794457a 100755 (executable)
--- 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 403e67abb9a3f3cfd15340b226eb3e69a173a2da..a8c0fa3ed17c3b47951c1533e51d861a8f3f3a9a 100644 (file)
--- 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);