[llvm-commits] CVS: llvm/tools/llvm-config/Makefile llvm-config.in.in
Chris Lattner
lattner at cs.uiuc.edu
Thu Jun 1 17:30:43 PDT 2006
Changes in directory llvm/tools/llvm-config:
Makefile updated: 1.7 -> 1.8
llvm-config.in.in updated: 1.4 -> 1.5
---
Log message:
Remove obsolete CORE_IS_ARCHIVE support
---
Diffs of the changes: (+4 -10)
Makefile | 1 -
llvm-config.in.in | 13 ++++---------
2 files changed, 4 insertions(+), 10 deletions(-)
Index: llvm/tools/llvm-config/Makefile
diff -u llvm/tools/llvm-config/Makefile:1.7 llvm/tools/llvm-config/Makefile:1.8
--- llvm/tools/llvm-config/Makefile:1.7 Wed May 31 20:52:49 2006
+++ llvm/tools/llvm-config/Makefile Thu Jun 1 19:30:31 2006
@@ -53,7 +53,6 @@
$(Echo) "Building llvm-config script."
$(Verb) $(ECHO) 's, at LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' > temp.sed
$(Verb) $(ECHO) 's, at LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed
- $(Verb) $(ECHO) 's, at CORE_IS_ARCHIVE@,$(CORE_IS_ARCHIVE),' >> temp.sed
$(Verb) $(SED) -f temp.sed < $< > $@
$(Verb) $(RM) temp.sed
$(Verb) cat $(FinalLibDeps) >> $@
Index: llvm/tools/llvm-config/llvm-config.in.in
diff -u llvm/tools/llvm-config/llvm-config.in.in:1.4 llvm/tools/llvm-config/llvm-config.in.in:1.5
--- llvm/tools/llvm-config/llvm-config.in.in:1.4 Wed Apr 12 23:21:31 2006
+++ llvm/tools/llvm-config/llvm-config.in.in Thu Jun 1 19:30:31 2006
@@ -17,9 +17,9 @@
#---- 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 @@
#---- 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 @@
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;
}
More information about the llvm-commits
mailing list