Add an option for getting the C compiler flags, --cflags.

Patch contributed by Chandler Carruth

llvm-svn: 32950

2 files changed, 6 insertions, 0 deletions

diff --git a/llvm/tools/llvm-config/Makefile b/llvm/tools/llvm-config/Makefile
index 410808b1f26..55e3b568a4b 100644
--- a/llvm/tools/llvm-config/Makefile
+++ b/llvm/tools/llvm-config/Makefile
@@ -20,6 +20,7 @@ include $(LEVEL)/Makefile.common
 ifeq ($(HAVE_PERL),1)
 
 # Combine preprocessor flags (except for -I) and CXX flags.
+SUB_CFLAGS = ${CPP.BaseFlags} ${C.Flags}
 SUB_CXXFLAGS = ${CPP.BaseFlags} ${CXX.Flags}
 
 # This is blank for now.  We need to be careful about adding stuff here:
@@ -55,6 +56,7 @@ llvm-config.in: $(ConfigInIn) $(ConfigStatusScript)
 # Build our final script.
 $(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps)
 	$(Echo) "Building llvm-config script."
+	$(Verb) $(ECHO) 's,@LLVM_CFLAGS@,$(SUB_CFLAGS),' > temp.sed
 	$(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' > temp.sed
 	$(Verb) $(ECHO) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed
 	$(Verb) $(ECHO) 's,@LLVM_BUILDMODE@,$(BuildMode),' >> temp.sed
diff --git a/llvm/tools/llvm-config/llvm-config.in.in b/llvm/tools/llvm-config/llvm-config.in.in
index e24b1c327c5..2f5af8a8582 100644
--- a/llvm/tools/llvm-config/llvm-config.in.in
+++ b/llvm/tools/llvm-config/llvm-config.in.in
@@ -45,6 +45,7 @@ my @TARGETS_BUILT       = map { lc($_) } qw{@TARGETS_TO_BUILD@};
 #---- end autoconf values ----
 
 #---- begin Makefile values ----
+my $CFLAGS              = q{@LLVM_CFLAGS@};
 my $CXXFLAGS            = q{@LLVM_CXXFLAGS@};
 my $LDFLAGS             = q{@LLVM_LDFLAGS@};
 my $SYSTEM_LIBS         = q{@LIBS@};
@@ -107,6 +108,8 @@ foreach my $arg (@ARGV) {
             $has_opt = 1; print "$INCLUDEDIR\n";
         } elsif ($arg eq "--libdir") {
             $has_opt = 1; print "$LIBDIR\n";
+        } elsif ($arg eq "--cflags") {
+            $has_opt = 1; print "-I$INCLUDEDIR $CFLAGS\n";
         } elsif ($arg eq "--cxxflags") {
             $has_opt = 1; print "-I$INCLUDEDIR $CXXFLAGS\n";
         } elsif ($arg eq "--ldflags") {
@@ -178,6 +181,7 @@ Options:
   --bindir               Directory containing LLVM executables.
   --includedir           Directory containing LLVM headers.
   --libdir               Directory containing LLVM libraries.
+  --cflags               C compiler flags for files that include LLVM headers.
   --cxxflags             C++ compiler flags for files that include LLVM headers.
   --ldflags              Print Linker flags.
   --libs                 Libraries needed to link against LLVM components.