Changeset 656ee4f


Ignore:
Timestamp:
Mar 27, 2017, 4:54:37 PM (5 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
626da644
Parents:
cb4d825 (diff), 6d48157 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/Makefile.am

    rcb4d825 r656ee4f  
    1111## Created On       : Sun May 31 08:54:01 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Wed Dec 14 15:17:30 2016
    14 ## Update Count     : 211
     13## Last Modified On : Sat Mar 25 18:00:10 2017
     14## Update Count     : 212
    1515###############################################################################
    1616
     
    4141CC = ${abs_top_srcdir}/src/driver/cfa
    4242
    43 headers = limits stdlib math iostream fstream iterator rational assert
     43headers = limits stdlib math iostream fstream iterator rational assert containers/vector
    4444
    4545# not all platforms support concurrency, add option do disable it
    4646if BUILD_CONCURRENCY
    47 headers += containers/vector concurrency/coroutine concurrency/thread concurrency/kernel concurrency/monitor
     47headers += concurrency/coroutine concurrency/thread concurrency/kernel concurrency/monitor
    4848endif
    4949
Note: See TracChangeset for help on using the changeset viewer.