Changeset 4084928e for src/benchmark/Makefile.am

Timestamp:

Aug 6, 2018, 9:02:25 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f47d0ad

Parents:

364d70c (diff), f271bdd (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' into demangler

File:

• src/benchmark/Makefile.am (modified) (2 diffs)

src/benchmark/Makefile.am

@@ -18 +18 @@
 CFLAGS =
 AM_CFLAGS = \
-        -XCFA \
-        -t \
-        -B${abs_top_builddir}/src/driver \
         -g \
         -O2 \
@@ -27 +24 @@
         -quiet \
         -I$(srcdir) \
-        -L${abs_top_builddir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa/containers \
-        -I${abs_top_srcdir}/src/libcfa/concurrency \
-        -I${abs_top_srcdir}/src/libcfa/stdhdr
-
-CC = ${top_builddir}/src/driver/cfa
+        @BUILD_IN_TREE_FLAGS@
+
+CC = @CFACC@
 TOOLSDIR = ${abs_top_srcdir}/tools/
 REPEAT   = ${TOOLSDIR}repeat