diff options
Diffstat (limited to 'tools/llvm-config/llvm-config.in.in')
| -rw-r--r-- | tools/llvm-config/llvm-config.in.in | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in index 36b5112bb67b6..7f93f168dfd8d 100644 --- a/tools/llvm-config/llvm-config.in.in +++ b/tools/llvm-config/llvm-config.in.in @@ -26,17 +26,6 @@ my $PREFIX = q{@LLVM_PREFIX@}; my $LLVM_CONFIGTIME = q{@LLVM_CONFIGTIME@}; my $LLVM_SRC_ROOT = q{@abs_top_srcdir@}; my $LLVM_OBJ_ROOT = q{@abs_top_builddir@}; -my $LLVM_ON_WIN32 = q{@LLVM_ON_WIN32@}; -my $LLVM_ON_UNIX = q{@LLVM_ON_UNIX@}; -my $LLVMGCCDIR = q{@LLVMGCCDIR@}; -my $LLVMGCC = q{@LLVMGCC@}; -my $LLVMGXX = q{@LLVMGXX@}; -my $LLVMGCC_VERSION = q{@LLVMGCC_VERSION@}; -my $LLVMGCC_MAJVERS = q{@LLVMGCC_MAJVERS@}; -my $ENDIAN = q{@ENDIAN@}; -my $SHLIBEXT = q{@SHLIBEXT@}; -my $EXEEXT = q{@EXEEXT@}; -my $OS = q{@OS@}; my $ARCH = lc(q{@ARCH@}); my $TARGET_TRIPLE = q{@target@}; my $TARGETS_TO_BUILD = q{@TARGETS_TO_BUILD@}; @@ -81,12 +70,15 @@ $ABS_OBJ_ROOT = `cd $ABS_OBJ_ROOT; $PWD` if (-d $ABS_OBJ_ROOT); chomp($ABS_OBJ_ROOT); my $INCLUDEDIR = "$ABS_RUN_DIR/include"; +my $INCLUDEOPTION = "-I$INCLUDEDIR"; my $LIBDIR = "$ABS_RUN_DIR/lib"; my $BINDIR = "$ABS_RUN_DIR/bin"; if ($ABS_RUN_DIR eq $ABS_OBJ_ROOT) { # If we are running out of the build directory, the include dir is in the # srcdir. $INCLUDEDIR = "$LLVM_SRC_ROOT/include"; + # We need include files from both the srcdir and objdir. + $INCLUDEOPTION = "-I$INCLUDEDIR -I$LLVM_OBJ_ROOT/include" } else { # If installed, ignore the prefix the tree was configured with, use the # current prefix. @@ -120,11 +112,11 @@ foreach my $arg (@ARGV) { } elsif ($arg eq "--libdir") { $has_opt = 1; print "$LIBDIR\n"; } elsif ($arg eq "--cppflags") { - $has_opt = 1; print "-I$INCLUDEDIR $CPPFLAGS\n"; + $has_opt = 1; print "$INCLUDEOPTION $CPPFLAGS\n"; } elsif ($arg eq "--cflags") { - $has_opt = 1; print "-I$INCLUDEDIR $CFLAGS\n"; + $has_opt = 1; print "$INCLUDEOPTION $CFLAGS\n"; } elsif ($arg eq "--cxxflags") { - $has_opt = 1; print "-I$INCLUDEDIR $CXXFLAGS\n"; + $has_opt = 1; print "$INCLUDEOPTION $CXXFLAGS\n"; } elsif ($arg eq "--ldflags") { $has_opt = 1; print "-L$LIBDIR $LDFLAGS $SYSTEM_LIBS\n"; } elsif ($arg eq "--libs") { @@ -330,7 +322,16 @@ sub build_name_map { foreach my $target (@TARGETS_BUILT) { # FIXME: Temporary, until we don't switch all targets if (defined $NAME_MAP{$target.'asmprinter'}) { - $NAME_MAP{$target} = [$target.'asmprinter', $target.'codegen'] + $NAME_MAP{$target} = [$target.'info', + $target.'asmprinter', + $target.'codegen'] + } else { + $NAME_MAP{$target} = [$target.'info', + $NAME_MAP{$target}[0]] + } + + if (defined $NAME_MAP{$target.'asmparser'}) { + push @{$NAME_MAP{$target}},$target.'asmparser' } } |