Changeset bbfd0e0 for libcfa/prelude

Timestamp:

Aug 7, 2019, 3:23:56 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

14347ac

Parents:

7e0017f5

Message:

Tentative support for distcc in cforall, right now nothing works because distcc doesn't understand cfa

Location:

libcfa/prelude

Files:

• Makefile.am (modified) (4 diffs)
• Makefile.in (modified) (6 diffs)

libcfa/prelude/Makefile.am

@@ -23 +23 @@
 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
 
-CC = @CFACC@
+CC = @LOCAL_CFACC@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CFAFLAGS = @CONFIG_CFAFLAGS@
@@ -54 +54 @@
 
 # create forward declarations for cfa builtins
-builtins.cf : builtins.c ${CC}
+builtins.cf : builtins.c @LOCAL_CFACC@
         ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po -D__cforall
         ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
@@ -60 +60 @@
 include $(DEPDIR)/builtins.Po
 
-bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
-        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACPP@
+        ${AM_V_GEN}@LOCAL_CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 maintainer-clean-local :
@@ -68 +68 @@
 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
 MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
+
+if ENABLE_DISTCC
+distribution: @LOCAL_CFACC@ @LOCAL_CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
+        ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
+        echo "Dummy file to track distribution to remote hosts" > ${@}
+
+all: all-am distribution
+endif ENABLE_DISTCC

libcfa/prelude/Makefile.in

@@ -167 +167 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CC = @CFACC@
+CC = @LOCAL_CFACC@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
@@ -174 +174 @@
 CFACC = @CFACC@
 CFACPP = @CFACPP@
+CFADIR_HASH = @CFADIR_HASH@
 CFA_BINDIR = @CFA_BINDIR@
 CFA_INCDIR = @CFA_INCDIR@
@@ -217 +218 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOCAL_CFACC = @LOCAL_CFACC@
+LOCAL_CFACPP = @LOCAL_CFACPP@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
@@ -236 +239 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PRELUDEFLAG = @PRELUDEFLAG@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -555 +559 @@
 
 # create forward declarations for cfa builtins
-builtins.cf : builtins.c ${CC}
+builtins.cf : builtins.c @LOCAL_CFACC@
         ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po -D__cforall
         ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
@@ -561 +565 @@
 include $(DEPDIR)/builtins.Po
 
-bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
-        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACPP@
+        ${AM_V_GEN}@LOCAL_CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 maintainer-clean-local :
         rm -rf $(DEPDIR)
+
+@ENABLE_DISTCC_TRUE@distribution: @LOCAL_CFACC@ @LOCAL_CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
+@ENABLE_DISTCC_TRUE@    ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
+@ENABLE_DISTCC_TRUE@    echo "Dummy file to track distribution to remote hosts" > ${@}
+
+@ENABLE_DISTCC_TRUE@all: all-am distribution
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.