Remove obsolete CORE_IS_ARCHIVE support

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28649 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2006-06-02 00:30:31 +00:00
parent 117f8cd896
commit 6574994397
2 changed files with 4 additions and 10 deletions

View File

@ -53,7 +53,6 @@ $(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps)
$(Echo) "Building llvm-config script." $(Echo) "Building llvm-config script."
$(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' > temp.sed $(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' > temp.sed
$(Verb) $(ECHO) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> 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) $(SED) -f temp.sed < $< > $@
$(Verb) $(RM) temp.sed $(Verb) $(RM) temp.sed
$(Verb) cat $(FinalLibDeps) >> $@ $(Verb) cat $(FinalLibDeps) >> $@

View File

@ -17,9 +17,9 @@ use warnings;
#---- begin autoconf values ---- #---- begin autoconf values ----
my $VERSION = q{@PACKAGE_VERSION@}; my $VERSION = q{@PACKAGE_VERSION@};
my $PREFIX = q{@LLVM_PREFIX@}; my $PREFIX = q{@LLVM_PREFIX@};
my $BINDIR = q{@LLVM_BINDIR@}; my $BINDIR = "$PREFIX/bin";
my $INCLUDEDIR = q{@LLVM_INCLUDEDIR@}; my $INCLUDEDIR = "$PREFIX/include";
my $LIBDIR = q{@LLVM_LIBDIR@}; my $LIBDIR = "$PREFIX/lib";
my $ARCH = lc(q{@ARCH@}); my $ARCH = lc(q{@ARCH@});
my $TARGET_HAS_JIT = q{@TARGET_HAS_JIT@}; my $TARGET_HAS_JIT = q{@TARGET_HAS_JIT@};
my @TARGETS_BUILT = map { lc($_) } qw{@TARGETS_TO_BUILD@}; 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 ---- #---- begin Makefile values ----
my $CXXFLAGS = q{@LLVM_CXXFLAGS@}; my $CXXFLAGS = q{@LLVM_CXXFLAGS@};
my $LDFLAGS = q{@LLVM_LDFLAGS@}; my $LDFLAGS = q{@LLVM_LDFLAGS@};
my $CORE_IS_ARCHIVE = q{@CORE_IS_ARCHIVE@};
#---- end Makefile values ---- #---- end Makefile values ----
sub usage; sub usage;
@ -359,12 +358,8 @@ sub maybe_fix_core (@) {
my @libs = @_; my @libs = @_;
my @result; my @result;
foreach my $lib (@libs) { 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; return @result;
} }