Changeset 81e60f7 for libcfa/prelude


Ignore:
Timestamp:
Sep 10, 2019, 5:03:23 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:
8209e70
Parents:
c2051e10
Message:

Fixed small merge problems

Location:
libcfa/prelude
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • 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" > ${@}
Note: See TracChangeset for help on using the changeset viewer.