Changeset 14347ac


Ignore:
Timestamp:
Aug 9, 2019, 5:03:08 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
ef46abb
Parents:
bbfd0e0
Message:

libcfa now properly supports building with --enable-distcc

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • driver/cfa.cc

    rbbfd0e0 r14347ac  
    140140
    141141        // process command-line arguments
     142
     143        args[nargs] = "-x";                                                                     // turn off language
     144        nargs += 1;
     145        args[nargs] = "c";
     146        nargs += 1;
    142147
    143148        for ( int i = 1; i < argc; i += 1 ) {
     
    303308        } // for
    304309
    305     args[nargs] = "-x";                                                                 // turn off language
    306     nargs += 1;
    307     args[nargs] = "none";
    308     nargs += 1;
    309 
    310310        #ifdef __x86_64__
    311311        args[nargs] = "-mcx16";                                                         // allow double-wide CAA
     
    557557        if ( ! quiet ) {
    558558                cerr << "CFA " << "Version " << Version << heading << endl;
    559 
    560559                if ( help ) {
    561560                        cerr <<
  • libcfa/Makefile.in

    rbbfd0e0 r14347ac  
    276276LN_S = @LN_S@
    277277LOCAL_CFACC = @LOCAL_CFACC@
    278 LOCAL_CFACPP = @LOCAL_CFACPP@
    279278LTLIBOBJS = @LTLIBOBJS@
    280279LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
  • libcfa/configure

    rbbfd0e0 r14347ac  
    709709PRELUDEFLAG
    710710CFADIR_HASH
    711 LOCAL_CFACPP
    712711LOCAL_CFACC
    713712CFACPP
     
    29602959if test x$enable_distcc = xno; then
    29612960        CFACC=${DRIVER_DIR}cfa
    2962         CFACPP=${DRIVER_DIR}cfa-cpp
    29632961        PRELUDEFLAG='-in-tree'
    29642962        echo "no"
     
    29672965        CFADIR_HASH=$(openssl dgst -sha256 <<< $path)
    29682966        CFADIR_HASH="${CFADIR_HASH: -10}"
    2969         CFACC="/home/tdelisle/workspace/master-cforall/main/tools/build/distcc ~/.cfadistcc/${CFADIR_HASH}/g++"
    2970         CFACPP="/home/tdelisle/workspace/master-cforall/main/tools/build/distcc ~/.cfadistcc/${CFADIR_HASH}/cfa-cpp"
     2967        CFACC="distcc ~/.cfadistcc/${CFADIR_HASH}/cfa"
    29712968        PRELUDEFLAG='-dist-tree'
    29722969        echo "yes (hash=${CFADIR_HASH})"
    29732970fi
     2971CFACPP=${DRIVER_DIR}cfa-cpp
    29742972LOCAL_CFACC=${DRIVER_DIR}cfa
    2975 LOCAL_CFACPP=${DRIVER_DIR}cfa-cpp
    29762973
    29772974 if test x$enable_distcc = xyes; then
     
    29822979  ENABLE_DISTCC_FALSE=
    29832980fi
    2984 
    29852981
    29862982
  • libcfa/configure.ac

    rbbfd0e0 r14347ac  
    3434if test x$enable_distcc = xno; then
    3535        CFACC=${DRIVER_DIR}cfa
    36         CFACPP=${DRIVER_DIR}cfa-cpp
    3736        PRELUDEFLAG='-in-tree'
    3837        echo "no"
     
    4140        CFADIR_HASH=$(openssl dgst -sha256 <<< $path)
    4241        CFADIR_HASH="${CFADIR_HASH: -10}"
    43         CFACC="/home/tdelisle/workspace/master-cforall/main/tools/build/distcc ~/.cfadistcc/${CFADIR_HASH}/g++"
    44         CFACPP="/home/tdelisle/workspace/master-cforall/main/tools/build/distcc ~/.cfadistcc/${CFADIR_HASH}/cfa-cpp"
     42        CFACC="distcc ~/.cfadistcc/${CFADIR_HASH}/cfa"
    4543        PRELUDEFLAG='-dist-tree'
    4644        echo "yes (hash=${CFADIR_HASH})"
    4745fi
     46CFACPP=${DRIVER_DIR}cfa-cpp
    4847LOCAL_CFACC=${DRIVER_DIR}cfa
    49 LOCAL_CFACPP=${DRIVER_DIR}cfa-cpp
    5048
    5149AM_CONDITIONAL([ENABLE_DISTCC], [test x$enable_distcc = xyes])
     
    5452AC_SUBST(CFACPP)
    5553AC_SUBST(LOCAL_CFACC)
    56 AC_SUBST(LOCAL_CFACPP)
    5754AC_SUBST(CFADIR_HASH)
    5855AC_SUBST(CFA_VERSION)
  • libcfa/prelude/Makefile.am

    rbbfd0e0 r14347ac  
    6060include $(DEPDIR)/builtins.Po
    6161
    62 bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACPP@
    63         ${AM_V_GEN}@LOCAL_CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     62bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     63        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    6464
    6565maintainer-clean-local :
     
    7070
    7171if ENABLE_DISTCC
    72 distribution: @LOCAL_CFACC@ @LOCAL_CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
     72distribution: @LOCAL_CFACC@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
    7373        ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
    7474        echo "Dummy file to track distribution to remote hosts" > ${@}
  • libcfa/prelude/Makefile.in

    rbbfd0e0 r14347ac  
    219219LN_S = @LN_S@
    220220LOCAL_CFACC = @LOCAL_CFACC@
    221 LOCAL_CFACPP = @LOCAL_CFACPP@
    222221LTLIBOBJS = @LTLIBOBJS@
    223222LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
     
    565564include $(DEPDIR)/builtins.Po
    566565
    567 bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACPP@
    568         ${AM_V_GEN}@LOCAL_CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     566bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     567        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    569568
    570569maintainer-clean-local :
    571570        rm -rf $(DEPDIR)
    572571
    573 @ENABLE_DISTCC_TRUE@distribution: @LOCAL_CFACC@ @LOCAL_CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
     572@ENABLE_DISTCC_TRUE@distribution: @LOCAL_CFACC@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
    574573@ENABLE_DISTCC_TRUE@    ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
    575574@ENABLE_DISTCC_TRUE@    echo "Dummy file to track distribution to remote hosts" > ${@}
  • libcfa/src/Makefile.am

    rbbfd0e0 r14347ac  
    3030# use -no-include-stdhdr to prevent rebuild cycles
    3131# The built sources must not depend on the installed headers
    32 AM_CFAFLAGS = -v @PRELUDEFLAG@ -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
     32AM_CFAFLAGS = -quiet @PRELUDEFLAG@ -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@ @LOCAL_CFACPP@ prelude.cfa
     64$(libobjs) : @LOCAL_CFACC@ @CFACPP@ prelude.cfa
    6565
    6666thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc))))
    67 $(thread_libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
     67$(thread_libobjs) : @LOCAL_CFACC@ @CFACPP@ prelude.cfa
    6868
    6969
     
    8484
    8585
    86 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
     86prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
    8787        ${AM_V_GEN}$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
    8888
    89 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
     89prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
    9090        ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
    9191        $(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
  • libcfa/src/Makefile.in

    rbbfd0e0 r14347ac  
    329329LN_S = @LN_S@
    330330LOCAL_CFACC = @LOCAL_CFACC@
    331 LOCAL_CFACPP = @LOCAL_CFACPP@
    332331LTLIBOBJS = @LTLIBOBJS@
    333332LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
     
    444443# use -no-include-stdhdr to prevent rebuild cycles
    445444# The built sources must not depend on the installed headers
    446 AM_CFAFLAGS = -v @PRELUDEFLAG@ -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
     445AM_CFAFLAGS = -quiet @PRELUDEFLAG@ -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
    447446AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    448447AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
     
    940939        $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    941940        $(am__mv) $$depbase.Tpo $$depbase.Plo
    942 $(libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
    943 $(thread_libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
     941$(libobjs) : @LOCAL_CFACC@ @CFACPP@ prelude.cfa
     942$(thread_libobjs) : @LOCAL_CFACC@ @CFACPP@ prelude.cfa
    944943
    945944-include $(libdeps)
     
    947946-include $(thread_libdeps)
    948947
    949 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
     948prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
    950949        ${AM_V_GEN}$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
    951950
    952 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
     951prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
    953952        ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
    954953        $(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
Note: See TracChangeset for help on using the changeset viewer.