Ignore:
Timestamp:
Dec 14, 2016, 3:31:11 PM (7 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
a7741435, c5a8c5b
Parents:
375a068 (diff), 4782b39 (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/tests/Makefile.in

    r375a068 r74e5a3aa  
    123123CFA_LIBDIR = @CFA_LIBDIR@
    124124CFA_PREFIX = @CFA_PREFIX@
    125 
    126 # applies to both programs
    127 CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ # TEMPORARY: does not build with -O2
     125CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
    128126CPP = @CPP@
    129127CPPFLAGS = @CPPFLAGS@
     
    223221top_builddir = @top_builddir@
    224222top_srcdir = @top_srcdir@
     223debug = yes
     224
     225# applies to both programs
     226EXTRA_FLAGS =
    225227fstream_test_SOURCES = fstream_test.c
    226228vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c
     
    652654
    653655all-tests :
    654         @+python test.py --all          # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
     656        @+python test.py --all --debug=${debug}         # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
    655657
    656658clean-local :
     
    676678
    677679declarationSpecifier: declarationSpecifier.c
    678         ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o ${@}
     680        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    679681
    680682gccExtensions : gccExtensions.c
     
    685687
    686688memberCtors-ERR1: memberCtors.c
    687         ${CC} ${CFALGS} -DERR1 ${<} -o ${@}
     689        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
    688690
    689691# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.