diff options
| author | Jeffrey Yasskin <jyasskin@google.com> | 2009-07-07 22:15:37 +0000 |
|---|---|---|
| committer | Jeffrey Yasskin <jyasskin@google.com> | 2009-07-07 22:15:37 +0000 |
| commit | 9a3b13fa9bc513d0a2b3e5c4f3396aacfa236864 (patch) | |
| tree | 6e5a61c67159d76d76402895dda09be16cc40beb /tools/llvm-config | |
| parent | 120505d5e7cfac352d44d84b50626e169a0ba404 (diff) | |
| download | llvm-9a3b13fa9bc513d0a2b3e5c4f3396aacfa236864.tar.gz llvm-9a3b13fa9bc513d0a2b3e5c4f3396aacfa236864.tar.bz2 llvm-9a3b13fa9bc513d0a2b3e5c4f3396aacfa236864.tar.xz | |
Fix http://llvm.org/PR4481: Make llvm-config print the right include paths when
srcdir!=objdir.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74956 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-config')
| -rw-r--r-- | tools/llvm-config/llvm-config.in.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in index 36b5112bb6..10a13b63c0 100644 --- a/tools/llvm-config/llvm-config.in.in +++ b/tools/llvm-config/llvm-config.in.in @@ -81,12 +81,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 +123,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") { |