Changeset 7fb69f6


Ignore:
Timestamp:
Jul 30, 2018, 10:34:00 AM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
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:
944a90f
Parents:
bf5a6477
Message:

Added configure variable for building cfa source in tree

Files:
15 edited

Legend:

Unmodified
Added
Removed

  • Makefile.in

    rbf5a6477 r7fb69f6  
    250250AWK = @AWK@
    251251BACKEND_CC = @BACKEND_CC@               # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
     252BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     253BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    252254CC = @CC@
    253255CCAS = @CCAS@

  • configure

    rbf5a6477 r7fb69f6  
    674674build_cpu
    675675build
     676BUILD_IN_TREE_FLAGS
     677BUILD_IN_TREE_FLAGS_NOLIB
    676678CFACPP
    677679CFACC
    … …  
    33803382# Create variables for commonly used targets
    33813383DRIVER_DIR='$(top_builddir)/src/driver'
    3382 
    33833384CFACC=${DRIVER_DIR}/cfa
    3384 
    33853385CFACPP=${DRIVER_DIR}/cfa-cpp
     3386
     3387
     3388
     3389
     3390# Flag variables needed to build in tree
     3391LIBCFA_SRC='$(top_srcdir)/src/libcfa'
     3392LIBCFA_BUILD='$(top_builddir)/src/libcfa'
     3393BUILD_IN_TREE_FLAGS_NOLIB="-XCFA -t -B${DRIVER_DIR}"
     3394BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}AM_CFLAGS/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
     3395
    33863396
    33873397

  • configure.ac

    rbf5a6477 r7fb69f6  
    173173# Create variables for commonly used targets
    174174DRIVER_DIR='$(top_builddir)/src/driver'
     175CFACC=${DRIVER_DIR}/cfa
     176CFACPP=${DRIVER_DIR}/cfa-cpp
    175177AC_SUBST(DRIVER_DIR)
    176 CFACC=${DRIVER_DIR}/cfa
    177178AC_SUBST(CFACC)
    178 CFACPP=${DRIVER_DIR}/cfa-cpp
    179179AC_SUBST(CFACPP)
     180
     181# Flag variables needed to build in tree
     182LIBCFA_SRC='$(top_srcdir)/src/libcfa'
     183LIBCFA_BUILD='$(top_builddir)/src/libcfa'
     184BUILD_IN_TREE_FLAGS_NOLIB="-XCFA -t -B${DRIVER_DIR}"
     185BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}AM_CFLAGS/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
     186AC_SUBST(BUILD_IN_TREE_FLAGS_NOLIB)
     187AC_SUBST(BUILD_IN_TREE_FLAGS)
    180188
    181189AC_CANONICAL_BUILD

  • src/Makefile.in

    rbf5a6477 r7fb69f6  
    365365AWK = @AWK@
    366366BACKEND_CC = @BACKEND_CC@
     367BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     368BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    367369CC = @CC@
    368370CCAS = @CCAS@

  • src/benchmark/Makefile.in

    rbf5a6477 r7fb69f6  
    135135AWK = @AWK@
    136136BACKEND_CC = @BACKEND_CC@
     137BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     138BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    137139CC = @CFACC@
    138140CCAS = @CCAS@

  • src/driver/Makefile.in

    rbf5a6477 r7fb69f6  
    181181AWK = @AWK@
    182182BACKEND_CC = @BACKEND_CC@
     183BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     184BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    183185CC = @CC@
    184186CCAS = @CCAS@

  • src/examples/Makefile.in

    rbf5a6477 r7fb69f6  
    189189AWK = @AWK@
    190190BACKEND_CC = @BACKEND_CC@
     191BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     192BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    191193CC = @CFA_BINDIR@/@CFA_NAME@
    192194CCAS = @CCAS@

  • src/libcfa/Makefile.am

    rbf5a6477 r7fb69f6  
    4343#use -no-include-stdhdr to prevent rebuild cycles
    4444#The built sources must not depend on the installed headers
    45 CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B@DRIVER_DIR@ ${EXTRA_FLAGS}
     45CFLAGS = -quiet -no-include-stdhdr @BUILD_IN_TREE_FLAGS@ ${EXTRA_FLAGS}
    4646CC = @CFACC@
    4747

  • src/libcfa/Makefile.in

    rbf5a6477 r7fb69f6  
    303303AWK = @AWK@
    304304BACKEND_CC = @BACKEND_CC@
     305BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     306BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    305307CC = @CFACC@
    306308CCAS = @CCAS@
    … …  
    321323#use -no-include-stdhdr to prevent rebuild cycles
    322324#The built sources must not depend on the installed headers
    323 CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B@DRIVER_DIR@ ${EXTRA_FLAGS}
     325CFLAGS = -quiet -no-include-stdhdr @BUILD_IN_TREE_FLAGS@ ${EXTRA_FLAGS}
    324326CPP = @CPP@
    325327CPPFLAGS = @CPPFLAGS@

  • src/prelude/Makefile.in

    rbf5a6477 r7fb69f6  
    162162AWK = @AWK@
    163163BACKEND_CC = @BACKEND_CC@
     164BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     165BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    164166CC = @CFACC@
    165167CCAS = @CCAS@

  • src/tests/Makefile.am

    rbf5a6477 r7fb69f6  
    3030# applies to both programs
    3131AM_CFLAGS = $(if $(test), 2> $(test), ) \
    32         -XCFA \
    33         -t \
    34         -B@DRIVER_DIR@ \
    3532        -g \
    3633        -Wall \
    3734        -Wno-unused-function \
    3835        -quiet @CFA_FLAGS@ \
    39         -I. \
    4036        -DIN_DIR="${srcdir}/.in/" \
    41         -L${abs_top_builddir}/src/libcfa \
    42         -I${abs_top_srcdir}/src/libcfa \
    43         -I${abs_top_srcdir}/src/libcfa/containers \
    44         -I${abs_top_srcdir}/src/libcfa/concurrency \
    45         -I${abs_top_srcdir}/src/libcfa/stdhdr
     37        @BUILD_IN_TREE_FLAGS@
    4638
    4739if !BUILD_DEBUG
    … …  
    8072
    8173% : %.c $(CC)
    82         $(COMPILE) $(abspath ${<}) -o ${@}
     74        echo "Compiling"
     75        $(COMPILE) ${<} -o ${@}
     76
     77/home/tdelisle/workspace/clean-cforall/main/build/../src/libcfa/stdlib:
     78        echo "Caught"
     79
    8380
    8481declarationSpecifier: declarationSpecifier.c $(CC)

  • src/tests/Makefile.in

    rbf5a6477 r7fb69f6  
    181181AWK = @AWK@
    182182BACKEND_CC = @BACKEND_CC@
     183BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     184BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    183185CC = @CFACC@
    184186CCAS = @CCAS@
    … …  
    301303
    302304# applies to both programs
    303 AM_CFLAGS = $(if $(test), 2> $(test), ) -XCFA -t -B@DRIVER_DIR@ -g \
    304         -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -I. \
    305         -DIN_DIR="${srcdir}/.in/" -L${abs_top_builddir}/src/libcfa \
    306         -I${abs_top_srcdir}/src/libcfa \
    307         -I${abs_top_srcdir}/src/libcfa/containers \
    308         -I${abs_top_srcdir}/src/libcfa/concurrency \
    309         -I${abs_top_srcdir}/src/libcfa/stdhdr $(am__append_1) \
    310         $(am__append_2) $(am__append_3)
     305AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
     306        -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" \
     307        @BUILD_IN_TREE_FLAGS@ $(am__append_1) $(am__append_2) \
     308        $(am__append_3)
    311309fstream_test_SOURCES = fstream_test.c
    312310avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
    … …  
    630628
    631629% : %.c $(CC)
    632         $(COMPILE) $(abspath ${<}) -o ${@}
     630        echo "Compiling"
     631        $(COMPILE) ${<} -o ${@}
     632
     633/home/tdelisle/workspace/clean-cforall/main/build/../src/libcfa/stdlib:
     634        echo "Caught"
    633635
    634636declarationSpecifier: declarationSpecifier.c $(CC)

  • src/tests/preempt_longrun/Makefile.in

    rbf5a6477 r7fb69f6  
    337337AWK = @AWK@
    338338BACKEND_CC = @BACKEND_CC@
     339BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     340BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    339341CC = @CFACC@
    340342CCAS = @CCAS@

  • tools/Makefile.in

    rbf5a6477 r7fb69f6  
    186186AWK = @AWK@
    187187BACKEND_CC = @BACKEND_CC@
     188BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     189BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    188190CC = @BACKEND_CC@
    189191CCAS = @CCAS@

  • tools/prettyprinter/Makefile.in

    rbf5a6477 r7fb69f6  
    210210AWK = @AWK@
    211211BACKEND_CC = @BACKEND_CC@
     212BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     213BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    212214CC = @CC@
    213215CCAS = @CCAS@
Note: See TracChangeset for help on using the changeset viewer.