Changeset 04c8bba for src/driver

Timestamp:

Dec 13, 2016, 3:15:11 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

37efaf56

Parents:

58dd019 (diff), 0edebf8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/driver

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• cfa.cc (modified) (2 diffs)

src/driver/Makefile.am

@@ -17 +17 @@
 # applies to both programs
 AM_CXXFLAGS = -Wall -O2
+if BUILD_NO_LIB
+else
+AM_CXXFLAGS += -DHAVE_LIBCFA
+endif
+if BUILD_DEBUG
+AM_CXXFLAGS += -DHAVE_LIBCFA_DEBUG
+endif
+if BUILD_RELEASE
+AM_CXXFLAGS += -DHAVE_LIBCFA_RELEASE
+endif
 
 bin_PROGRAMS = cfa

src/driver/Makefile.in

@@ -38 +38 @@
 build_triplet = @build@
 host_triplet = @host@
+@BUILD_NO_LIB_FALSE@am__append_1 = -DHAVE_LIBCFA
+@BUILD_DEBUG_TRUE@am__append_2 = -DHAVE_LIBCFA_DEBUG
+@BUILD_RELEASE_TRUE@am__append_3 = -DHAVE_LIBCFA_RELEASE
 bin_PROGRAMS = cfa$(EXEEXT)
 cc1lib_PROGRAMS = cc1$(EXEEXT)
@@ -204 +207 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2
+AM_CXXFLAGS = -Wall -O2 $(am__append_1) $(am__append_2) \
+        $(am__append_3)
 cfa_SOURCES = cfa.cc
 

src/driver/cfa.cc

@@ -231 +231 @@
         } // if
 
-        string d;
-        if ( debug ) {
-                d = "-d";
-        } // if
-
         // add the CFA include-library paths, which allow direct access to header files without directory qualification
-
         args[nargs] = "-I" CFA_INCDIR;
         nargs += 1;
@@ -249 +243 @@
         nargs += 1;
 
+#ifdef HAVE_LIBCFA
         if ( link ) {
+                #if ! defined(HAVE_LIBCFA_RELEASE)
+                        if( !debug ) { 
+                                cerr << "error: Option -nodebug is not available, libcfa was not installed." << endl;
+                                exit( EXIT_FAILURE );
+                                }
+                #endif
+                #if ! defined(HAVE_LIBCFA_DEBUG)
+                        if( debug ) { 
+                                cerr << "error: Option -debug is not available, libcfa-d was not installed." << endl;
+                                exit( EXIT_FAILURE );
+                                }
+                #endif
+
                 // include the cfa library in case it's needed
                 args[nargs] = "-L" CFA_LIBDIR;
                 nargs += 1;
-                args[nargs] = "-lcfa";
-                nargs += 1;
-        } // if
+                if( debug ) {
+                        args[nargs] = "-lcfa-d";
+                } else {
+                        args[nargs] = "-lcfa";
+                }
+                nargs += 1;
+        } // if
+#endif //HAVE_LIBCFA
 
         // add the correct set of flags based on the type of compile this is