Changeset d746bc8


Ignore:
Timestamp:
Jul 27, 2017, 2:55:31 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
4d4e5de
Parents:
b947fb2
Message:

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

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/driver/cfa.cc

    rb947fb2 rd746bc8  
    1010// Created On       : Tue Aug 20 13:44:49 2002
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Jul 20 15:54:45 2017
    13 // Update Count     : 156
     12// Last Modified On : Fri Jan 20 14:38:45 2017
     13// Update Count     : 155
    1414//
    1515
     
    7676        bool cpp_flag = false;                                                          // -E or -M flag, preprocessor only
    7777        bool std_flag = false;                                                          // -std= flag
     78        bool noincstd_flag = false;                                                     // -no-include-stdhdr= flag
    7879        bool debugging __attribute(( unused )) = false;         // -g flag
    7980
     
    133134                        } else if ( arg == "-nohelp" ) {
    134135                                help = false;                                                   // strip the nohelp flag
     136                        } else if ( arg == "-no-include-stdhdr" ) {
     137                                noincstd_flag = true;                                   // strip the no-include-stdhdr flag
    135138                        } else if ( arg == "-compiler" ) {
    136139                                // use the user specified compiler
     
    231234        args[nargs] = "-I" CFA_INCDIR;
    232235        nargs += 1;
    233         args[nargs] = "-I" CFA_INCDIR "/stdhdr";
    234         nargs += 1;
     236        if ( ! noincstd_flag ) {                                                        // do not use during build
     237                args[nargs] = "-I" CFA_INCDIR "/stdhdr";
     238                nargs += 1;
     239        } // if
    235240        args[nargs] = "-I" CFA_INCDIR "/concurrency";
    236241        nargs += 1;
  • src/libcfa/Makefile.am

    rb947fb2 rd746bc8  
    3939
    4040AM_CCASFLAGS = @CFA_FLAGS@
    41 CFLAGS = -quiet -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
     41
     42#CFLAGS for most libcfa src
     43#use -no-include-stdhdr to prevent rebuild cycles
     44#The built sources must not depend on the installed headers
     45CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
    4246CC = ${abs_top_srcdir}/src/driver/cfa
    4347
  • src/libcfa/Makefile.in

    rb947fb2 rd746bc8  
    308308CFA_NAME = @CFA_NAME@
    309309CFA_PREFIX = @CFA_PREFIX@
    310 CFLAGS = -quiet -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
     310
     311#CFLAGS for most libcfa src
     312#use -no-include-stdhdr to prevent rebuild cycles
     313#The built sources must not depend on the installed headers
     314CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
    311315CPP = @CPP@
    312316CPPFLAGS = @CPPFLAGS@
Note: See TracChangeset for help on using the changeset viewer.