Changes in / [ef46abb:4f5a8a2]


Ignore:
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • configure

    ref46abb r4f5a8a2  
    663663ac_ct_DUMPBIN
    664664DUMPBIN
     665LD
    665666FGREP
    666667EGREP
    … …  
    700701LDFLAGS
    701702CXXFLAGS
     703CXX
    702704CFA_FLAGS
    703705LIBCFA_TARGET_MAKEFILES
    … …  
    721723CFA_INCDIR
    722724CFA_PREFIX
    723 LD
    724 CXX
    725 ENABLE_DISTCC_FALSE
    726 ENABLE_DISTCC_TRUE
    727725DOendif
    728726DOifskipcompile
    … …  
    799797enable_silent_rules
    800798with_cfa_name
    801 enable_distcc
    802799with_target_hosts
    803800enable_gprofiler
    … …  
    14621459  --enable-silent-rules   less verbose build output (undo: "make V=1")
    14631460  --disable-silent-rules  verbose build output (undo: "make V=0")
    1464   --enable-distcc     whether or not to enable distributed compilation
    14651461  --enable-gprofiler     whether or not to enable gprofiler tools (if available)
    14661462  --enable-demangler     whether or not to build the demangler (executable and library)
    … …  
    31843180
    31853181DOendif='endif'
    3186 
    3187 
    3188 
    3189 #==============================================================================
    3190 # distcc support
    3191 
    3192 # Check whether --enable-distcc was given.
    3193 if test "${enable_distcc+set}" = set; then :
    3194   enableval=$enable_distcc; enable_distcc=$enableval
    3195 else
    3196   enable_distcc=no
    3197 fi
    3198 
    3199 
    3200  if test x$enable_distcc = xyes; then
    3201   ENABLE_DISTCC_TRUE=
    3202   ENABLE_DISTCC_FALSE='#'
    3203 else
    3204   ENABLE_DISTCC_TRUE='#'
    3205   ENABLE_DISTCC_FALSE=
    3206 fi
    3207 
    3208 
    3209 if test x$enable_distcc = xyes; then
    3210         CXX="distcc ${CXX}"
    3211         LD="distcc ${LD} -lstdc++"
    3212         echo "Enabling distributed builds"
    3213 fi
    3214 
    32153182
    32163183
    … …  
    1705017017fi
    1705117018
    17052 if test -z "${ENABLE_DISTCC_TRUE}" && test -z "${ENABLE_DISTCC_FALSE}"; then
    17053   as_fn_error $? "conditional \"ENABLE_DISTCC\" was never defined.
    17054 Usually this means the macro was only invoked conditionally." "$LINENO" 5
    17055 fi
    1705617019if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    1705717020  as_fn_error $? "conditional \"AMDEP\" was never defined.

  • configure.ac

    ref46abb r4f5a8a2  
    5656AC_SUBST([DOendif])
    5757AM_SUBST_NOTMAKE([DOendif])
    58 
    59 #==============================================================================
    60 # distcc support
    61 
    62 AC_ARG_ENABLE(distcc,
    63         [  --enable-distcc     whether or not to enable distributed compilation],
    64         enable_distcc=$enableval, enable_distcc=no)
    65 
    66 AM_CONDITIONAL([ENABLE_DISTCC], [test x$enable_distcc = xyes])
    67 
    68 if test x$enable_distcc = xyes; then
    69         CXX="distcc ${CXX}"
    70         LD="distcc ${LD} -lstdc++"
    71         echo "Enabling distributed builds"
    72 fi
    73 
    74 AC_SUBST(CXX)
    75 AC_SUBST(LD)
    7658
    7759#==============================================================================

  • driver/cfa.cc

    ref46abb r4f5a8a2  
    7676        return false;
    7777} //dirExists
    78 
    79 static inline string dir(const string & path) {
    80         return path.substr(0, path.find_last_of('/'));
    81 }
    8278
    8379
    … …  
    116112        bool m64 = false;                                                                       // -m64 flag
    117113        bool intree = false;
    118         bool disttree = false;
    119114
    120115        const char *args[argc + 100];                                           // cfa command line values, plus some space for additional flags
    … …  
    133128
    134129        // process command-line arguments
    135 
    136         args[nargs] = "-x";                                                                     // turn off language
    137         nargs += 1;
    138         args[nargs] = "c";
    139         nargs += 1;
    140130
    141131        for ( int i = 1; i < argc; i += 1 ) {
    … …  
    181171                        } else if ( arg == "-in-tree" ) {
    182172                                intree = true;
    183                         } else if ( arg == "-dist-tree" ) {
    184                                 disttree = true;
    185173                        } else if ( arg == "-compiler" ) {
    186174                                // use the user specified compiler
    … …  
    392380        string libdir = libbase + arch + "-" + config;
    393381
    394         if (!disttree) {
    395                 if ( ! nolib && ! dirExists( libdir ) ) {
    396                         cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
    397                         cerr << "Was looking for " << libdir << endl;
    398                         for(int i = 1; i < argc; i++) {
    399                                 cerr << argv[i] << " ";
    400                         }
    401                         cerr << endl;
    402                         libdir = libbase + arch + "-" + "nolib";
    403                 } // if
    404 
    405                 if ( ! dirExists( libdir ) ) {
    406                         cerr << argv[0] << " internal error, cannot find prelude directory." << endl;
    407                         cerr << "Was looking for " << libdir << endl;
    408                         exit( EXIT_FAILURE );
    409                 } // if
    410         } // if
    411 
    412         if(disttree) {
    413                 args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + dir(argv[0])) ).c_str();
    414         } else if(intree) {
    415                 args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir + "/prelude") ).c_str();
    416         } else {
    417                 args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir) ).c_str();
    418         }
     382        if ( ! nolib && ! dirExists( libdir ) ) {
     383                cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
     384                cerr << "Was looking for " << libdir << endl;
     385                libdir = libbase + arch + "-" + "nolib";
     386        } // if
     387
     388        if ( ! dirExists( libdir ) ) {
     389                cerr << argv[0] << " internal error, cannot find prelude directory." << endl;
     390                cerr << "Was looking for " << libdir << endl;
     391                exit( EXIT_FAILURE );
     392        } // if
     393
     394        args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir + (intree ? "/prelude" : "")) ).c_str();
    419395        nargs += 1;
    420396
    … …  
    505481
    506482        if ( Bprefix.length() == 0 ) {
    507                 if(disttree) {
    508                         Bprefix = dir(argv[0]);
    509                 } else if(intree) {
    510                         Bprefix = srcdriverdir;
    511                 } else {
    512                         Bprefix = installlibdir;
    513                 }
    514 
     483                Bprefix = ! intree ? installlibdir : srcdriverdir;
    515484                if ( Bprefix[Bprefix.length() - 1] != '/' ) Bprefix += '/';
    516485                args[nargs] = ( *new string( string("-D__GCC_BPREFIX__=") + Bprefix ) ).c_str();
    … …  
    570539        if ( ! quiet ) {
    571540                cerr << "CFA " << "Version " << Version << heading << endl;
     541
    572542                if ( help ) {
    573543                        cerr <<

  • libcfa/Makefile.in

    ref46abb r4f5a8a2  
    231231CFACC = @CFACC@
    232232CFACPP = @CFACPP@
    233 CFADIR_HASH = @CFADIR_HASH@
    234233CFA_BINDIR = @CFA_BINDIR@
    235234CFA_INCDIR = @CFA_INCDIR@
    … …  
    275274LIPO = @LIPO@
    276275LN_S = @LN_S@
    277 LOCAL_CFACC = @LOCAL_CFACC@
    278276LTLIBOBJS = @LTLIBOBJS@
    279277LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    … …  
    295293PACKAGE_VERSION = @PACKAGE_VERSION@
    296294PATH_SEPARATOR = @PATH_SEPARATOR@
    297 PRELUDEFLAG = @PRELUDEFLAG@
    298295RANLIB = @RANLIB@
    299296SED = @SED@

  • libcfa/configure

    ref46abb r4f5a8a2  
    707707CONFIG_CFLAGS
    708708ARCH_FLAGS
    709 PRELUDEFLAG
    710 CFADIR_HASH
    711 LOCAL_CFACC
    712709CFACPP
    713710CFACC
    714 ENABLE_DISTCC_FALSE
    715 ENABLE_DISTCC_TRUE
    716711CFA_VERSION
    717712DRIVER_DIR
    … …  
    788783enable_option_checking
    789784enable_silent_rules
    790 enable_distcc
    791785with_cfa_name
    792786enable_shared
    … …  
    14511445  --enable-silent-rules   less verbose build output (undo: "make V=1")
    14521446  --disable-silent-rules  verbose build output (undo: "make V=0")
    1453   --enable-distcc     whether or not to enable distributed compilation
    14541447  --enable-shared[=PKGS]  build shared libraries [default=yes]
    14551448  --enable-static[=PKGS]  build static libraries [default=yes]
    … …  
    29482941
    29492942
    2950 # Check whether --enable-distcc was given.
    2951 if test "${enable_distcc+set}" = set; then :
    2952   enableval=$enable_distcc; enable_distcc=$enableval
    2953 else
    2954   enable_distcc=no
    2955 fi
    2956 
    2957 
    2958 echo -n "checking for distributated build... "
    2959 if test x$enable_distcc = xno; then
    2960         CFACC=${DRIVER_DIR}cfa
    2961         PRELUDEFLAG='-in-tree'
    2962         echo "no"
    2963 else
    2964         path=$(readlink -f .)
    2965         CFADIR_HASH=$(openssl dgst -sha256 <<< $path)
    2966         CFADIR_HASH="${CFADIR_HASH: -10}"
    2967         CFACC="distcc ~/.cfadistcc/${CFADIR_HASH}/cfa"
    2968         PRELUDEFLAG='-dist-tree'
    2969         echo "yes (hash=${CFADIR_HASH})"
    2970 fi
     2943CFACC=${DRIVER_DIR}cfa
    29712944CFACPP=${DRIVER_DIR}cfa-cpp
    2972 LOCAL_CFACC=${DRIVER_DIR}cfa
    2973 
    2974  if test x$enable_distcc = xyes; then
    2975   ENABLE_DISTCC_TRUE=
    2976   ENABLE_DISTCC_FALSE='#'
    2977 else
    2978   ENABLE_DISTCC_TRUE='#'
    2979   ENABLE_DISTCC_FALSE=
    2980 fi
    2981 
    2982 
    2983 
    2984 
    2985 
    29862945
    29872946
    … …  
    1702316982fi
    1702416983
    17025 if test -z "${ENABLE_DISTCC_TRUE}" && test -z "${ENABLE_DISTCC_FALSE}"; then
    17026   as_fn_error $? "conditional \"ENABLE_DISTCC\" was never defined.
    17027 Usually this means the macro was only invoked conditionally." "$LINENO" 5
    17028 fi
    1702916984if test -z "${BUILDLIB_TRUE}" && test -z "${BUILDLIB_FALSE}"; then
    1703016985  as_fn_error $? "conditional \"BUILDLIB\" was never defined.

  • libcfa/configure.ac

    ref46abb r4f5a8a2  
    2727AC_ARG_VAR(CFA_VERSION, [The long version of cfa])
    2828
    29 AC_ARG_ENABLE(distcc,
    30         [  --enable-distcc     whether or not to enable distributed compilation],
    31         enable_distcc=$enableval, enable_distcc=no)
    32 
    33 echo -n "checking for distributated build... "
    34 if test x$enable_distcc = xno; then
    35         CFACC=${DRIVER_DIR}cfa
    36         PRELUDEFLAG='-in-tree'
    37         echo "no"
    38 else
    39         path=$(readlink -f .)
    40         CFADIR_HASH=$(openssl dgst -sha256 <<< $path)
    41         CFADIR_HASH="${CFADIR_HASH: -10}"
    42         CFACC="distcc ~/.cfadistcc/${CFADIR_HASH}/cfa"
    43         PRELUDEFLAG='-dist-tree'
    44         echo "yes (hash=${CFADIR_HASH})"
    45 fi
     29CFACC=${DRIVER_DIR}cfa
    4630CFACPP=${DRIVER_DIR}cfa-cpp
    47 LOCAL_CFACC=${DRIVER_DIR}cfa
    48 
    49 AM_CONDITIONAL([ENABLE_DISTCC], [test x$enable_distcc = xyes])
    50 
    5131AC_SUBST(CFACC)
    5232AC_SUBST(CFACPP)
    53 AC_SUBST(LOCAL_CFACC)
    54 AC_SUBST(CFADIR_HASH)
    5533AC_SUBST(CFA_VERSION)
    56 AC_SUBST(PRELUDEFLAG)
    5734
    5835#==============================================================================

  • libcfa/prelude/Makefile.am

    ref46abb r4f5a8a2  
    2323cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    2424
    25 CC = @LOCAL_CFACC@
     25CC = @CFACC@
    2626AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    2727AM_CFAFLAGS = @CONFIG_CFAFLAGS@
    … …  
    5454
    5555# create forward declarations for cfa builtins
    56 builtins.cf : builtins.c @LOCAL_CFACC@
     56builtins.cf : builtins.c ${CC}
    5757        ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po -D__cforall
    5858        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
    … …  
    6868MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    6969MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    70 
    71 if ENABLE_DISTCC
    72 distribution: @LOCAL_CFACC@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
    73         ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
    74         echo "Dummy file to track distribution to remote hosts" > ${@}
    75 
    76 all: all-am distribution
    77 endif ENABLE_DISTCC

  • libcfa/prelude/Makefile.in

    ref46abb r4f5a8a2  
    167167AUTOMAKE = @AUTOMAKE@
    168168AWK = @AWK@
    169 CC = @LOCAL_CFACC@
     169CC = @CFACC@
    170170CCAS = @CCAS@
    171171CCASDEPMODE = @CCASDEPMODE@
    … …  
    174174CFACC = @CFACC@
    175175CFACPP = @CFACPP@
    176 CFADIR_HASH = @CFADIR_HASH@
    177176CFA_BINDIR = @CFA_BINDIR@
    178177CFA_INCDIR = @CFA_INCDIR@
    … …  
    218217LIPO = @LIPO@
    219218LN_S = @LN_S@
    220 LOCAL_CFACC = @LOCAL_CFACC@
    221219LTLIBOBJS = @LTLIBOBJS@
    222220LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    … …  
    238236PACKAGE_VERSION = @PACKAGE_VERSION@
    239237PATH_SEPARATOR = @PATH_SEPARATOR@
    240 PRELUDEFLAG = @PRELUDEFLAG@
    241238RANLIB = @RANLIB@
    242239SED = @SED@
    … …  
    558555
    559556# create forward declarations for cfa builtins
    560 builtins.cf : builtins.c @LOCAL_CFACC@
     557builtins.cf : builtins.c ${CC}
    561558        ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po -D__cforall
    562559        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
    … …  
    569566maintainer-clean-local :
    570567        rm -rf $(DEPDIR)
    571 
    572 @ENABLE_DISTCC_TRUE@distribution: @LOCAL_CFACC@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
    573 @ENABLE_DISTCC_TRUE@    ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
    574 @ENABLE_DISTCC_TRUE@    echo "Dummy file to track distribution to remote hosts" > ${@}
    575 
    576 @ENABLE_DISTCC_TRUE@all: all-am distribution
    577568
    578569# Tell versions [3.59,3.63) of GNU make to not export all variables.

  • libcfa/src/Makefile.am

    ref46abb r4f5a8a2  
    3030# use -no-include-stdhdr to prevent rebuild cycles
    3131# The built sources must not depend on the installed headers
    32 AM_CFAFLAGS = -quiet @PRELUDEFLAG@ -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
     32AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
    3333AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    3434AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    … …  
    6262# add dependency of cfa files
    6363libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(libsrc))))
    64 $(libobjs) : @LOCAL_CFACC@ @CFACPP@ prelude.cfa
     64$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
    6565
    6666thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc))))
    67 $(thread_libobjs) : @LOCAL_CFACC@ @CFACPP@ prelude.cfa
     67$(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
    6868
    6969
    … …  
    8484
    8585
    86 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
    87         ${AM_V_GEN}$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
     86prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     87        ${AM_V_GEN}$(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    8888
    89 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
     89prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    9090        ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
    91         $(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
     91        $(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    9292
    9393

  • libcfa/src/Makefile.in

    ref46abb r4f5a8a2  
    284284CFACC = @CFACC@
    285285CFACPP = @CFACPP@
    286 CFADIR_HASH = @CFADIR_HASH@
    287286CFA_BINDIR = @CFA_BINDIR@
    288287CFA_INCDIR = @CFA_INCDIR@
    … …  
    328327LIPO = @LIPO@
    329328LN_S = @LN_S@
    330 LOCAL_CFACC = @LOCAL_CFACC@
    331329LTLIBOBJS = @LTLIBOBJS@
    332330LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    … …  
    348346PACKAGE_VERSION = @PACKAGE_VERSION@
    349347PATH_SEPARATOR = @PATH_SEPARATOR@
    350 PRELUDEFLAG = @PRELUDEFLAG@
    351348RANLIB = @RANLIB@
    352349SED = @SED@
    … …  
    443440# use -no-include-stdhdr to prevent rebuild cycles
    444441# The built sources must not depend on the installed headers
    445 AM_CFAFLAGS = -quiet @PRELUDEFLAG@ -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
     442AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
    446443AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    447444AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    … …  
    939936        $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    940937        $(am__mv) $$depbase.Tpo $$depbase.Plo
    941 $(libobjs) : @LOCAL_CFACC@ @CFACPP@ prelude.cfa
    942 $(thread_libobjs) : @LOCAL_CFACC@ @CFACPP@ prelude.cfa
     938$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
     939$(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
    943940
    944941-include $(libdeps)
    … …  
    946943-include $(thread_libdeps)
    947944
    948 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
    949         ${AM_V_GEN}$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
    950 
    951 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
     945prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     946        ${AM_V_GEN}$(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
     947
     948prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    952949        ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
    953         $(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
     950        $(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    954951
    955952#----------------------------------------------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.