Changes in directory llvm/tools/llvm-config:
Makefile updated: 1.12 -> 1.13
llvm-config.in.in updated: 1.18 -> 1.19
---
Log message:
Changes to support cross-compiling LLVM. The GenLibDeps.pl script needs to
have a compile-host version of "nm", not build-host. In order to effect this
we must use autoconf to determine the correct "nm" to use and propagate that
through the makefiles, through llvm-config and finally to GenLibDeps.pl as
an optional argument.
Patch contributed by Anton Korobeynikov. Thanks!
---
Diffs of the changes: (+3 -2)
Makefile | 2 +-
llvm-config.in.in | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
Index: llvm/tools/llvm-config/Makefile
diff -u llvm/tools/llvm-config/Makefile:1.12
llvm/tools/llvm-config/Makefile:1.13
--- llvm/tools/llvm-config/Makefile:1.12 Wed Jul 26 12:10:54 2006
+++ llvm/tools/llvm-config/Makefile Thu Jul 27 18:00:30 2006
@@ -33,7 +33,7 @@
$(LibDeps): $(GenLibDeps) $(LibDir) $(wildcard $(LibDir)/*.a $(LibDir)/*.o)
$(Echo) "Regenerating LibDeps.txt"
- $(Verb) $(GenLibDeps) -flat $(LibDir) | sort > $(LibDeps)
+ $(Verb) $(GenLibDeps) -flat $(LibDir) $(NM_PATH) | sort > $(LibDeps)
# Find all the cyclic dependencies between various LLVM libraries, so we
# don't have to process them at runtime.
Index: llvm/tools/llvm-config/llvm-config.in.in
diff -u llvm/tools/llvm-config/llvm-config.in.in:1.18
llvm/tools/llvm-config/llvm-config.in.in:1.19
--- llvm/tools/llvm-config/llvm-config.in.in:1.18 Tue Jun 6 19:43:18 2006
+++ llvm/tools/llvm-config/llvm-config.in.in Thu Jul 27 18:00:30 2006
@@ -47,6 +47,7 @@
#---- begin Makefile values ----
my $CXXFLAGS = [EMAIL PROTECTED]@};
my $LDFLAGS = [EMAIL PROTECTED]@};
+my $SYSTEM_LIBS = [EMAIL PROTECTED]@};
my $LLVM_BUILDMODE = [EMAIL PROTECTED]@};
#---- end Makefile values ----
@@ -109,7 +110,7 @@
} elsif ($arg eq "--cxxflags") {
$has_opt = 1; print "-I$INCLUDEDIR $CXXFLAGS\n";
} elsif ($arg eq "--ldflags") {
- $has_opt = 1; print "-L$LIBDIR $LDFLAGS\n";
+ $has_opt = 1; print "-L$LIBDIR $LDFLAGS $SYSTEM_LIBS\n";
} elsif ($arg eq "--libs") {
$has_opt = 1; $want_libs = 1;
} elsif ($arg eq "--libnames") {
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
