Changeset 6382128 for src

Timestamp:

Jul 6, 2018, 7:08:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c0cc5da

Parents:

a1cfa0c (diff), 1d386a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/prelude

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• prelude-gen.cc (added)
• prelude.old.cf (moved) (moved from src/prelude/prelude.cf)

src/prelude/Makefile.am

@@ -42 +42 @@
         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E prototypes.c | awk -f prototypes.awk > $@
 
+prelude.cf : prelude-gen.cc
+        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${<} -o prelude-gen
+        @./prelude-gen > $@
+        @rm ./prelude-gen
+
 builtins.def :
 

src/prelude/Makefile.in

@@ -511 +511 @@
         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E prototypes.c | awk -f prototypes.awk > $@
 
+prelude.cf : prelude-gen.cc
+        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${<} -o prelude-gen
+        @./prelude-gen > $@
+        @rm ./prelude-gen
+
 builtins.def :