Changeset d746bc8

Timestamp:

Jul 27, 2017, 2:55:31 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

4d4e5de

Parents:

b947fb2

Message:

Reverted no-include-stdhdr, it was needed to prevent dependency cycles

Location:

src

Files:

• driver/cfa.cc (modified) (4 diffs)
• libcfa/Makefile.am (modified) (1 diff)
• libcfa/Makefile.in (modified) (1 diff)

src/driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 15:54:45 2017
-// Update Count     : 156
+// Last Modified On : Fri Jan 20 14:38:45 2017
+// Update Count     : 155
 //
 
@@ -76 +76 @@
         bool cpp_flag = false;                                                          // -E or -M flag, preprocessor only
         bool std_flag = false;                                                          // -std= flag
+        bool noincstd_flag = false;                                                     // -no-include-stdhdr= flag
         bool debugging __attribute(( unused )) = false;         // -g flag
 
@@ -133 +134 @@
                         } else if ( arg == "-nohelp" ) {
                                 help = false;                                                   // strip the nohelp flag
+                        } else if ( arg == "-no-include-stdhdr" ) {
+                                noincstd_flag = true;                                   // strip the no-include-stdhdr flag
                         } else if ( arg == "-compiler" ) {
                                 // use the user specified compiler
@@ -231 +234 @@
         args[nargs] = "-I" CFA_INCDIR;
         nargs += 1;
-        args[nargs] = "-I" CFA_INCDIR "/stdhdr";
-        nargs += 1;
+        if ( ! noincstd_flag ) {                                                        // do not use during build
+                args[nargs] = "-I" CFA_INCDIR "/stdhdr";
+                nargs += 1;
+        } // if
         args[nargs] = "-I" CFA_INCDIR "/concurrency";
         nargs += 1;

src/libcfa/Makefile.am

@@ -39 +39 @@
 
 AM_CCASFLAGS = @CFA_FLAGS@
-CFLAGS = -quiet -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
+
+#CFLAGS for most libcfa src
+#use -no-include-stdhdr to prevent rebuild cycles
+#The built sources must not depend on the installed headers
+CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
 CC = ${abs_top_srcdir}/src/driver/cfa
 

src/libcfa/Makefile.in

@@ -308 +308 @@
 CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
-CFLAGS = -quiet -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
+
+#CFLAGS for most libcfa src
+#use -no-include-stdhdr to prevent rebuild cycles
+#The built sources must not depend on the installed headers
+CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@