From 323906e0282463cced4831adc875cf9052e0daee Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Fri, 2 Jun 2006 00:30:31 +0000
Subject: [PATCH] Remove obsolete CORE_IS_ARCHIVE support

llvm-svn: 28649
---
 llvm/tools/llvm-config/Makefile          |  1 -
 llvm/tools/llvm-config/llvm-config.in.in | 13 ++++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/llvm/tools/llvm-config/Makefile b/llvm/tools/llvm-config/Makefile
index 7fd7a3c97944..d777e812e141 100644
--- a/llvm/tools/llvm-config/Makefile
+++ b/llvm/tools/llvm-config/Makefile
@@ -53,7 +53,6 @@ $(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps)
 	$(Echo) "Building llvm-config script."
 	$(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' > temp.sed
 	$(Verb) $(ECHO) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed
-	$(Verb) $(ECHO) 's,@CORE_IS_ARCHIVE@,$(CORE_IS_ARCHIVE),' >> temp.sed
 	$(Verb) $(SED) -f temp.sed < $< > $@
 	$(Verb) $(RM) temp.sed
 	$(Verb) cat $(FinalLibDeps) >> $@
diff --git a/llvm/tools/llvm-config/llvm-config.in.in b/llvm/tools/llvm-config/llvm-config.in.in
index 1760b02418fd..89efde40e280 100644
--- a/llvm/tools/llvm-config/llvm-config.in.in
+++ b/llvm/tools/llvm-config/llvm-config.in.in
@@ -17,9 +17,9 @@ use warnings;
 #---- begin autoconf values ----
 my $VERSION             = q{@PACKAGE_VERSION@};
 my $PREFIX              = q{@LLVM_PREFIX@};
-my $BINDIR              = q{@LLVM_BINDIR@};
-my $INCLUDEDIR          = q{@LLVM_INCLUDEDIR@};
-my $LIBDIR              = q{@LLVM_LIBDIR@};
+my $BINDIR              = "$PREFIX/bin";
+my $INCLUDEDIR          = "$PREFIX/include";
+my $LIBDIR              = "$PREFIX/lib";
 my $ARCH                = lc(q{@ARCH@});
 my $TARGET_HAS_JIT      = q{@TARGET_HAS_JIT@};
 my @TARGETS_BUILT       = map { lc($_) } qw{@TARGETS_TO_BUILD@};
@@ -28,7 +28,6 @@ my @TARGETS_BUILT       = map { lc($_) } qw{@TARGETS_TO_BUILD@};
 #---- begin Makefile values ----
 my $CXXFLAGS            = q{@LLVM_CXXFLAGS@};
 my $LDFLAGS             = q{@LLVM_LDFLAGS@};
-my $CORE_IS_ARCHIVE     = q{@CORE_IS_ARCHIVE@};
 #---- end Makefile values ----
 
 sub usage;
@@ -359,11 +358,7 @@ sub maybe_fix_core (@) {
     my @libs = @_;
     my @result;
     foreach my $lib (@libs) {
-        if ($lib eq "LLVMCore.o" && $CORE_IS_ARCHIVE) {
-            push @result, "libLLVMCore.a";
-        } else {
-            push @result, $lib;
-        }
+        push @result, $lib;
     }
     return @result;
 }