Ignore:
Timestamp:
Aug 2, 2018, 1:41:30 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:
0a76d84
Parents:
a2f146ee (diff), a5da6a3 (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 plg2:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/benchmark/Makefile.in

    ra2f146ee rfde66c2  
    135135AWK = @AWK@
    136136BACKEND_CC = @BACKEND_CC@
    137 CC = ${top_builddir}/src/driver/cfa
     137BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     138BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
     139CC = @CFACC@
    138140CCAS = @CCAS@
    139141CCASDEPMODE = @CCASDEPMODE@
    140142CCASFLAGS = @CCASFLAGS@
    141143CCDEPMODE = @CCDEPMODE@
     144CFACC = @CFACC@
     145CFACPP = @CFACPP@
    142146CFA_BACKEND_CC = @CFA_BACKEND_CC@
    143147CFA_BINDIR = @CFA_BINDIR@
     
    158162DEFS = @DEFS@
    159163DEPDIR = @DEPDIR@
     164DRIVER_DIR = @DRIVER_DIR@
    160165ECHO_C = @ECHO_C@
    161166ECHO_N = @ECHO_N@
     
    248253top_srcdir = @top_srcdir@
    249254AM_CFLAGS = \
    250         -XCFA \
    251         -t \
    252         -B${abs_top_builddir}/src/driver \
    253255        -g \
    254256        -O2 \
     
    257259        -quiet \
    258260        -I$(srcdir) \
    259         -L${abs_top_builddir}/src/libcfa \
    260         -I${abs_top_srcdir}/src/libcfa \
    261         -I${abs_top_srcdir}/src/libcfa/containers \
    262         -I${abs_top_srcdir}/src/libcfa/concurrency \
    263         -I${abs_top_srcdir}/src/libcfa/stdhdr
     261        @BUILD_IN_TREE_FLAGS@
    264262
    265263TOOLSDIR = ${abs_top_srcdir}/tools/
Note: See TracChangeset for help on using the changeset viewer.