Changeset 365d553c

Timestamp:

Jun 16, 2017, 4:36:55 PM (8 years ago)

Author:

Andrew Beach <ajbeach@…>

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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

e1055441

Parents:

c529a24 (diff), 667c7da (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/tests/preempt_longrun

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)

src/tests/preempt_longrun/Makefile.am

@@ -32 +32 @@
 all-local: ${TESTS:=.run}
 
-% : %.c /u0/tdelisle/workspace/cfa-cc/bin/cfa
+% : %.c ${CC}
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
 

src/tests/preempt_longrun/Makefile.in

@@ -466 +466 @@
 all-local: ${TESTS:=.run}
 
-% : %.c /u0/tdelisle/workspace/cfa-cc/bin/cfa
+% : %.c ${CC}
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}