Ignore:
Timestamp:
Feb 20, 2017, 12:37:03 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, 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, resolv-new, with_gc
Children:
fc39193
Parents:
7fb1db7 (diff), 3bff885 (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/libcfa/Makefile.am

    r7fb1db7 r210587b  
    4040CC = ${abs_top_srcdir}/src/driver/cfa
    4141
    42 headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
    43 runtimehdrs = concurrency
     42headers = limits stdlib math iostream fstream iterator rational assert
     43
     44# not all platforms support concurrency, add option do disable it
     45if BUILD_CONCURRENCY
     46headers += containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
     47endif
     48
    4449libobjs = ${headers:=.o}
     50libsrc = libcfa-prelude.c ${headers:=.c}
     51
     52# not all platforms support concurrency, add option do disable it
     53if BUILD_CONCURRENCY
     54libsrc += concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
     55endif
    4556
    4657# extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
     
    5667${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    5768
    58 libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    5969
    6070libcfa_a_SOURCES = ${libsrc}
Note: See TracChangeset for help on using the changeset viewer.