diff options
| author | Chris Lattner <sabre@nondot.org> | 2006-06-02 00:30:31 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2006-06-02 00:30:31 +0000 |
| commit | 6574994397576c3d3809d3665b9d34d65809238f (patch) | |
| tree | 4711e31b9a24130b6b7f60108f48f30faa465697 /tools/llvm-config | |
| parent | 117f8cd896c9ea7d4d92fd5b53301d0e66603d1b (diff) | |
| download | external_llvm-6574994397576c3d3809d3665b9d34d65809238f.zip external_llvm-6574994397576c3d3809d3665b9d34d65809238f.tar.gz external_llvm-6574994397576c3d3809d3665b9d34d65809238f.tar.bz2 | |
Remove obsolete CORE_IS_ARCHIVE support
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28649 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-config')
| -rw-r--r-- | tools/llvm-config/Makefile | 1 | ||||
| -rw-r--r-- | tools/llvm-config/llvm-config.in.in | 13 |
2 files changed, 4 insertions, 10 deletions
diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile index 7fd7a3c..d777e81 100644 --- a/tools/llvm-config/Makefile +++ b/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/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in index 1760b02..89efde4 100644 --- a/tools/llvm-config/llvm-config.in.in +++ b/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; } |