[llvm-commits] CVS: llvm/tools/llvm-config/Makefile find-cycles.pl llvm-config.in.in

[Anton Korobeynikov]

Changes in directory llvm/tools/llvm-config:

Makefile updated: 1.14 -> 1.15
find-cycles.pl updated: 1.5 -> 1.6
llvm-config.in.in updated: 1.20 -> 1.21
---
Log message:

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


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

 Makefile          |    2 +-
 find-cycles.pl    |    2 +-
 llvm-config.in.in |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm/tools/llvm-config/Makefile
diff -u llvm/tools/llvm-config/Makefile:1.14 llvm/tools/llvm-config/Makefile:1.15
--- llvm/tools/llvm-config/Makefile:1.14	Thu Aug  3 16:46:42 2006
+++ llvm/tools/llvm-config/Makefile	Fri Aug  4 16:52:23 2006
@@ -33,7 +33,7 @@
 
 $(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.


Index: llvm/tools/llvm-config/find-cycles.pl
diff -u llvm/tools/llvm-config/find-cycles.pl:1.5 llvm/tools/llvm-config/find-cycles.pl:1.6
--- llvm/tools/llvm-config/find-cycles.pl:1.5	Thu Aug  3 16:46:42 2006
+++ llvm/tools/llvm-config/find-cycles.pl	Fri Aug  4 16:52:23 2006
@@ -29,7 +29,7 @@
 # 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;


Index: llvm/tools/llvm-config/llvm-config.in.in
diff -u llvm/tools/llvm-config/llvm-config.in.in:1.20 llvm/tools/llvm-config/llvm-config.in.in:1.21
--- llvm/tools/llvm-config/llvm-config.in.in:1.20	Thu Aug  3 16:45:35 2006
+++ llvm/tools/llvm-config/llvm-config.in.in	Fri Aug  4 16:52:23 2006
@@ -275,7 +275,7 @@
     $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);