Changeset 81e60f7


Ignore:
Timestamp:
Sep 10, 2019, 5:03:23 PM (2 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
8209e70
Parents:
c2051e10
Message:

Fixed small merge problems

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • driver/cfa.cc

    rc2051e10 r81e60f7  
    3333using std::to_string;
    3434
    35 //#define __DEBUG_H__
     35// #define __DEBUG_H__
    3636
    3737static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );               // "N__=" suffix
     
    345345
    346346        if(disttree) {
    347                 Putenv( argv, "--prelude-dir=" + dir(argv[0])) );
     347                Putenv( argv, "--prelude-dir=" + dir(argv[0]) );
    348348        } else if(intree) {
    349                 Putenv( argv, "--prelude-dir=" + libdir + "/prelude") );
    350         } else {
    351                 Putenv( argv, "--prelude-dir=" + libdir) );
     349                Putenv( argv, "--prelude-dir=" + libdir + "/prelude" );
     350        } else {
     351                Putenv( argv, "--prelude-dir=" + libdir );
    352352        }
    353         nargs += 1;
     353
    354354        for ( int i = 0; i < nlibs; i += 1 ) {                          // copy non-user libraries after all user libraries
    355355                args[nargs++] = libs[i];
     
    402402        } // if
    403403
    404         Putenv( argv, "--prelude-dir=" + libdir + (intree ? "/prelude" : "") );
    405 
    406404        if ( debug ) {
    407405                heading += " (debug)";
     
    420418                }
    421419                if ( bprefix[bprefix.length() - 1] != '/' ) bprefix += '/';
    422                 Putenv( argv, ( *new string( string("-B=") + bprefix ) ).c_str() );
     420                Putenv( argv, string("-B=") + bprefix );
    423421        } // if
    424422
  • libcfa/Makefile.in

    rc2051e10 r81e60f7  
    275275LIPO = @LIPO@
    276276LN_S = @LN_S@
     277LOCAL_CC1 = @LOCAL_CC1@
    277278LOCAL_CFACC = @LOCAL_CFACC@
    278279LTLIBOBJS = @LTLIBOBJS@
  • libcfa/configure

    rc2051e10 r81e60f7  
    709709PRELUDEFLAG
    710710CFADIR_HASH
     711LOCAL_CC1
    711712LOCAL_CFACC
    712713CFACPP
     
    29722973CFACPP=${DRIVER_DIR}cfa-cpp
    29732974LOCAL_CFACC=${DRIVER_DIR}cfa
     2975LOCAL_CC1=${DRIVER_DIR}cc1
    29742976
    29752977 if test x$enable_distcc = xyes; then
     
    29802982  ENABLE_DISTCC_FALSE=
    29812983fi
     2984
    29822985
    29832986
  • libcfa/configure.ac

    rc2051e10 r81e60f7  
    4747CFACPP=${DRIVER_DIR}cfa-cpp
    4848LOCAL_CFACC=${DRIVER_DIR}cfa
     49LOCAL_CC1=${DRIVER_DIR}cc1
    4950
    5051AM_CONDITIONAL([ENABLE_DISTCC], [test x$enable_distcc = xyes])
     
    5354AC_SUBST(CFACPP)
    5455AC_SUBST(LOCAL_CFACC)
     56AC_SUBST(LOCAL_CC1)
    5557AC_SUBST(CFADIR_HASH)
    5658AC_SUBST(CFA_VERSION)
  • libcfa/prelude/Makefile.am

    rc2051e10 r81e60f7  
    7070
    7171if ENABLE_DISTCC
    72 distribution: @LOCAL_CFACC@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
     72distribution: @LOCAL_CFACC@ @LOCAL_CC1@ @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

    rc2051e10 r81e60f7  
    218218LIPO = @LIPO@
    219219LN_S = @LN_S@
     220LOCAL_CC1 = @LOCAL_CC1@
    220221LOCAL_CFACC = @LOCAL_CFACC@
    221222LTLIBOBJS = @LTLIBOBJS@
     
    570571        rm -rf $(DEPDIR)
    571572
    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@distribution: @LOCAL_CFACC@ @LOCAL_CC1@ @CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
    573574@ENABLE_DISTCC_TRUE@    ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
    574575@ENABLE_DISTCC_TRUE@    @echo "Dummy file to track distribution to remote hosts" > ${@}
  • libcfa/src/Makefile.in

    rc2051e10 r81e60f7  
    328328LIPO = @LIPO@
    329329LN_S = @LN_S@
     330LOCAL_CC1 = @LOCAL_CC1@
    330331LOCAL_CFACC = @LOCAL_CFACC@
    331332LTLIBOBJS = @LTLIBOBJS@
Note: See TracChangeset for help on using the changeset viewer.