Changeset e523b07


Ignore:
Timestamp:
Sep 21, 2018, 4:09:32 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
fcc57ba
Parents:
72b0573
Message:

Implemented the nolib configuration

Files:
10 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r72b0573 re523b07  
    3838libcfa/prelude/gcc-builtins.cf
    3939libcfa/prelude/gcc-builtins.c
    40 libcfa/prelude/prelude.cf
     40libcfa/prelude/prelude.cfa
    4141libcfa/x64-debug/
    4242libcfa/x64-nodebug/
  • libcfa/Makefile.in

    r72b0573 re523b07  
    229229CFLAGS = @CFLAGS@
    230230CONFIGURATION = @CONFIGURATION@
     231CONFIG_BUILDLIB = @CONFIG_BUILDLIB@
    231232CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
    232233CONFIG_CFLAGS = @CONFIG_CFLAGS@
  • libcfa/configure

    r72b0573 re523b07  
    623623CFA_PREFIX
    624624CFA_NAME
     625BUILDLIB_FALSE
     626BUILDLIB_TRUE
     627CONFIG_BUILDLIB
    625628CONFIG_CFAFLAGS
    626629CONFIG_CFLAGS
     
    25312534                CONFIG_CFLAGS="-O0 -g"
    25322535                CONFIG_CFAFLAGS="-debug"
     2536                CONFIG_BUILDLIB="yes"
    25332537        ;;
    25342538        "nodebug" )
    25352539                CONFIG_CFLAGS="-O2 -s"
    25362540                CONFIG_CFAFLAGS="-nodebug"
     2541                CONFIG_BUILDLIB="yes"
    25372542        ;;
    25382543        "nolib"   )
    2539                 CONFIG_CFLAGS=""
    2540                 CONFIG_CFAFLAGS=""
     2544                CONFIG_CFLAGS="-O2 -s"
     2545                CONFIG_CFAFLAGS="-nodebug"
     2546                CONFIG_BUILDLIB="no"
    25412547        ;;
    25422548esac
    25432549
    25442550
     2551
     2552
     2553
     2554 if test "x${CONFIG_BUILDLIB}" = "xyes"; then
     2555  BUILDLIB_TRUE=
     2556  BUILDLIB_FALSE='#'
     2557else
     2558  BUILDLIB_TRUE='#'
     2559  BUILDLIB_FALSE=
     2560fi
    25452561
    25462562
     
    44784494fi
    44794495
     4496if test -z "${BUILDLIB_TRUE}" && test -z "${BUILDLIB_FALSE}"; then
     4497  as_fn_error $? "conditional \"BUILDLIB\" was never defined.
     4498Usually this means the macro was only invoked conditionally." "$LINENO" 5
     4499fi
    44804500if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    44814501  as_fn_error $? "conditional \"AMDEP\" was never defined.
  • libcfa/configure.ac

    r72b0573 re523b07  
    4141                CONFIG_CFLAGS="-O0 -g"
    4242                CONFIG_CFAFLAGS="-debug"
     43                CONFIG_BUILDLIB="yes"
    4344        ;;
    4445        "nodebug" )
    4546                CONFIG_CFLAGS="-O2 -s"
    4647                CONFIG_CFAFLAGS="-nodebug"
     48                CONFIG_BUILDLIB="yes"
    4749        ;;
    4850        "nolib"   )
    49                 CONFIG_CFLAGS=""
    50                 CONFIG_CFAFLAGS=""
     51                CONFIG_CFLAGS="-O2 -s"
     52                CONFIG_CFAFLAGS="-nodebug"
     53                CONFIG_BUILDLIB="no"
    5154        ;;
    5255esac
     
    5457AC_SUBST(CONFIG_CFLAGS)
    5558AC_SUBST(CONFIG_CFAFLAGS)
     59AC_SUBST(CONFIG_BUILDLIB)
     60
     61AM_CONDITIONAL([BUILDLIB], [test "x${CONFIG_BUILDLIB}" = "xyes"])
    5662
    5763#==============================================================================
  • libcfa/prelude/Makefile.am

    r72b0573 re523b07  
    2020# put into lib for now
    2121cfalibdir = ${CFA_LIBDIR}
    22 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
     22cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    2323
    2424CC = @CFACC@
     
    4343        ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
    4444
    45 prelude.cf : prelude-gen.cc
     45prelude.cfa : prelude-gen.cc
    4646        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
    4747        @./prelude-gen > $@
     
    5959include $(DEPDIR)/builtins.Po
    6060
    61 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     61bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    6262        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    6363
     
    6565        rm -rf $(DEPDIR)
    6666
    67 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf
     67MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    6868MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
  • libcfa/prelude/Makefile.in

    r72b0573 re523b07  
    174174CFLAGS = @CFLAGS@
    175175CONFIGURATION = @CONFIGURATION@
     176CONFIG_BUILDLIB = @CONFIG_BUILDLIB@
    176177CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
    177178CONFIG_CFLAGS = @CONFIG_CFLAGS@
     
    263264# put into lib for now
    264265cfalibdir = ${CFA_LIBDIR}
    265 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
     266cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    266267AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    267268AM_CFAFLAGS = @CONFIG_CFAFLAGS@
    268 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf
     269MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    269270MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    270271all: all-am
     
    498499        ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
    499500
    500 prelude.cf : prelude-gen.cc
     501prelude.cfa : prelude-gen.cc
    501502        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
    502503        @./prelude-gen > $@
     
    514515include $(DEPDIR)/builtins.Po
    515516
    516 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     517bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    517518        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    518519
  • libcfa/prelude/prelude-gen.cc

    r72b0573 re523b07  
    142142
    143143int main() {
    144         cout << "# 2 \"prelude.cf\"  // needed for error messages from this file" << endl;
     144        cout << "# 2 \"prelude.cfa\"  // needed for error messages from this file" << endl;
    145145        cout << "trait sized(dtype T) {};" << endl;
    146146
  • libcfa/src/Makefile.am

    r72b0573 re523b07  
    3636
    3737#----------------------------------------------------------------------------------------------------------------
     38if BUILDLIB
    3839headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
    3940          containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
    4041
     42headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
     43
    4144# not all platforms support concurrency, add option do disable it
    4245headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
     46
     47headers_nosrc += concurrency/invoke.h
    4348
    4449libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
     
    4651# not all platforms support concurrency, add option do disable it
    4752libsrc += concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
     53else
     54headers =
     55headers_nosrc =
     56libsrc =
     57endif
     58
    4859
    4960#----------------------------------------------------------------------------------------------------------------
    5061# add dependency to cfa-cpp so all libraries are rebuilt with new translator
    51 #@CFACC@ @CFACPP@ prelude.cf
     62#@CFACC@ @CFACPP@ prelude.cfa
    5263
    5364# add dependency of cfa files
    5465libobjs = $(addsuffix .o, $(basename $(filter %.cfa,$(libsrc))))
    55 $(libobjs) : @CFACC@ @CFACPP@ prelude.cf
     66$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
    5667
    5768
     
    6475-include $(libdeps)
    6576
    66 prelude.o : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    67         ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -in-tree -XCFA -l ${<} -c -o ${@}
     77prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     78        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    6879
    6980
    7081
    7182#----------------------------------------------------------------------------------------------------------------
    72 libcfa_a_SOURCES = prelude.o ${libsrc}
     83libcfa_a_SOURCES = prelude.cfa ${libsrc}
    7384
    7485stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
    7586
    7687cfa_includedir = $(CFA_INCDIR)
    77 nobase_cfa_include_HEADERS = \
    78         ${headers}             \
    79         ${stdhdr}              \
    80         math.hfa               \
    81         gmp.hfa                \
    82         time_t.hfa             \
    83         bits/align.hfa         \
    84         bits/containers.hfa    \
    85         bits/defs.hfa          \
    86         bits/debug.hfa         \
    87         bits/locks.hfa         \
    88         concurrency/invoke.h
     88nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
    8989
    9090#----------------------------------------------------------------------------------------------------------------
  • libcfa/src/Makefile.in

    r72b0573 re523b07  
    9696am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    9797        $(ACLOCAL_M4)
    98 DIST_COMMON = $(srcdir)/Makefile.am $(nobase_cfa_include_HEADERS) \
    99         $(am__DIST_COMMON)
     98DIST_COMMON = $(srcdir)/Makefile.am \
     99        $(am__nobase_cfa_include_HEADERS_DIST) $(am__DIST_COMMON)
    100100mkinstalldirs = $(install_sh) -d
    101101CONFIG_CLEAN_FILES =
     
    137137libcfa_a_AR = $(AR) $(ARFLAGS)
    138138libcfa_a_LIBADD =
     139am__libcfa_a_SOURCES_DIST = prelude.cfa startup.cfa interpose.cfa \
     140        bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
     141        fstream.cfa iostream.cfa iterator.cfa limits.cfa rational.cfa \
     142        time.cfa stdlib.cfa common.cfa containers/maybe.cfa \
     143        containers/pair.cfa containers/result.cfa \
     144        containers/vector.cfa concurrency/coroutine.cfa \
     145        concurrency/thread.cfa concurrency/kernel.cfa \
     146        concurrency/monitor.cfa concurrency/mutex.cfa \
     147        concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
     148        concurrency/invoke.c concurrency/preemption.cfa
    139149am__dirstamp = $(am__leading_dot)dirstamp
    140 am__objects_1 = fstream.$(OBJEXT) iostream.$(OBJEXT) \
    141         iterator.$(OBJEXT) limits.$(OBJEXT) rational.$(OBJEXT) \
    142         time.$(OBJEXT) stdlib.$(OBJEXT) common.$(OBJEXT) \
    143         containers/maybe.$(OBJEXT) containers/pair.$(OBJEXT) \
    144         containers/result.$(OBJEXT) containers/vector.$(OBJEXT) \
    145         concurrency/coroutine.$(OBJEXT) concurrency/thread.$(OBJEXT) \
    146         concurrency/kernel.$(OBJEXT) concurrency/monitor.$(OBJEXT) \
    147         concurrency/mutex.$(OBJEXT)
    148 am__objects_2 = startup.$(OBJEXT) interpose.$(OBJEXT) \
    149         bits/debug.$(OBJEXT) assert.$(OBJEXT) exception.$(OBJEXT) \
    150         virtual.$(OBJEXT) heap.$(OBJEXT) $(am__objects_1) \
    151         concurrency/CtxSwitch-@ARCHITECTURE@.$(OBJEXT) \
    152         concurrency/alarm.$(OBJEXT) concurrency/invoke.$(OBJEXT) \
    153         concurrency/preemption.$(OBJEXT)
    154 am_libcfa_a_OBJECTS = $(am__objects_2)
     150@BUILDLIB_TRUE@am__objects_1 = fstream.$(OBJEXT) iostream.$(OBJEXT) \
     151@BUILDLIB_TRUE@ iterator.$(OBJEXT) limits.$(OBJEXT) \
     152@BUILDLIB_TRUE@ rational.$(OBJEXT) time.$(OBJEXT) \
     153@BUILDLIB_TRUE@ stdlib.$(OBJEXT) common.$(OBJEXT) \
     154@BUILDLIB_TRUE@ containers/maybe.$(OBJEXT) \
     155@BUILDLIB_TRUE@ containers/pair.$(OBJEXT) \
     156@BUILDLIB_TRUE@ containers/result.$(OBJEXT) \
     157@BUILDLIB_TRUE@ containers/vector.$(OBJEXT) \
     158@BUILDLIB_TRUE@ concurrency/coroutine.$(OBJEXT) \
     159@BUILDLIB_TRUE@ concurrency/thread.$(OBJEXT) \
     160@BUILDLIB_TRUE@ concurrency/kernel.$(OBJEXT) \
     161@BUILDLIB_TRUE@ concurrency/monitor.$(OBJEXT) \
     162@BUILDLIB_TRUE@ concurrency/mutex.$(OBJEXT)
     163@BUILDLIB_TRUE@am__objects_2 = startup.$(OBJEXT) interpose.$(OBJEXT) \
     164@BUILDLIB_TRUE@ bits/debug.$(OBJEXT) assert.$(OBJEXT) \
     165@BUILDLIB_TRUE@ exception.$(OBJEXT) virtual.$(OBJEXT) \
     166@BUILDLIB_TRUE@ heap.$(OBJEXT) $(am__objects_1) \
     167@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.$(OBJEXT) \
     168@BUILDLIB_TRUE@ concurrency/alarm.$(OBJEXT) \
     169@BUILDLIB_TRUE@ concurrency/invoke.$(OBJEXT) \
     170@BUILDLIB_TRUE@ concurrency/preemption.$(OBJEXT)
     171am_libcfa_a_OBJECTS = prelude.$(OBJEXT) $(am__objects_2)
    155172libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
    156173AM_V_P = $(am__v_P_@AM_V@)
     
    189206am__v_CCLD_1 =
    190207SOURCES = $(libcfa_a_SOURCES)
    191 DIST_SOURCES = $(libcfa_a_SOURCES)
     208DIST_SOURCES = $(am__libcfa_a_SOURCES_DIST)
    192209am__can_run_installinfo = \
    193210  case $$AM_UPDATE_INFO_DIR in \
     
    195212    *) (install-info --version) >/dev/null 2>&1;; \
    196213  esac
     214am__nobase_cfa_include_HEADERS_DIST = ${shell find ${srcdir}/stdhdr \
     215        -type f -printf "%p "} fstream.hfa iostream.hfa iterator.hfa \
     216        limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
     217        containers/maybe.hfa containers/pair.hfa containers/result.hfa \
     218        containers/vector.hfa concurrency/coroutine.hfa \
     219        concurrency/thread.hfa concurrency/kernel.hfa \
     220        concurrency/monitor.hfa concurrency/mutex.hfa math.hfa gmp.hfa \
     221        time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa \
     222        bits/debug.hfa bits/locks.hfa concurrency/invoke.h
    197223HEADERS = $(nobase_cfa_include_HEADERS)
    198224am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
     
    242268CFLAGS = @CFLAGS@
    243269CONFIGURATION = @CONFIGURATION@
     270CONFIG_BUILDLIB = @CONFIG_BUILDLIB@
    244271CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
    245272CONFIG_CFLAGS = @CONFIG_CFLAGS@
     
    343370AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    344371AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
     372@BUILDLIB_FALSE@headers =
    345373
    346374#----------------------------------------------------------------------------------------------------------------
    347375
    348376# not all platforms support concurrency, add option do disable it
    349 headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa \
    350         rational.hfa time.hfa stdlib.hfa common.hfa \
    351         containers/maybe.hfa containers/pair.hfa containers/result.hfa \
    352         containers/vector.hfa concurrency/coroutine.hfa \
    353         concurrency/thread.hfa concurrency/kernel.hfa \
    354         concurrency/monitor.hfa concurrency/mutex.hfa
     377@BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa \
     378@BUILDLIB_TRUE@ limits.hfa rational.hfa time.hfa stdlib.hfa \
     379@BUILDLIB_TRUE@ common.hfa containers/maybe.hfa \
     380@BUILDLIB_TRUE@ containers/pair.hfa containers/result.hfa \
     381@BUILDLIB_TRUE@ containers/vector.hfa concurrency/coroutine.hfa \
     382@BUILDLIB_TRUE@ concurrency/thread.hfa concurrency/kernel.hfa \
     383@BUILDLIB_TRUE@ concurrency/monitor.hfa concurrency/mutex.hfa
     384@BUILDLIB_FALSE@headers_nosrc =
     385@BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa \
     386@BUILDLIB_TRUE@ bits/align.hfa bits/containers.hfa \
     387@BUILDLIB_TRUE@ bits/defs.hfa bits/debug.hfa bits/locks.hfa \
     388@BUILDLIB_TRUE@ concurrency/invoke.h
     389@BUILDLIB_FALSE@libsrc =
    355390
    356391# not all platforms support concurrency, add option do disable it
    357 libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
    358         exception.c virtual.c heap.cfa ${headers:.hfa=.cfa} \
    359         concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
    360         concurrency/invoke.c concurrency/preemption.cfa
     392@BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa \
     393@BUILDLIB_TRUE@ assert.cfa exception.c virtual.c heap.cfa \
     394@BUILDLIB_TRUE@ ${headers:.hfa=.cfa} \
     395@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.S \
     396@BUILDLIB_TRUE@ concurrency/alarm.cfa concurrency/invoke.c \
     397@BUILDLIB_TRUE@ concurrency/preemption.cfa
    361398
    362399#----------------------------------------------------------------------------------------------------------------
    363400# add dependency to cfa-cpp so all libraries are rebuilt with new translator
    364 #@CFACC@ @CFACPP@ prelude.cf
     401#@CFACC@ @CFACPP@ prelude.cfa
    365402
    366403# add dependency of cfa files
     
    375412
    376413#----------------------------------------------------------------------------------------------------------------
    377 libcfa_a_SOURCES = prelude.o ${libsrc}
     414libcfa_a_SOURCES = prelude.cfa ${libsrc}
    378415stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
    379416cfa_includedir = $(CFA_INCDIR)
    380 nobase_cfa_include_HEADERS = \
    381         ${headers}             \
    382         ${stdhdr}              \
    383         math.hfa               \
    384         gmp.hfa                \
    385         time_t.hfa             \
    386         bits/align.hfa         \
    387         bits/containers.hfa    \
    388         bits/defs.hfa          \
    389         bits/debug.hfa         \
    390         bits/locks.hfa         \
    391         concurrency/invoke.h
    392 
     417nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
    393418all: all-am
    394419
     
    799824        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    800825        $(am__mv) $$depbase.Tpo $$depbase.Po
    801 $(libobjs) : @CFACC@ @CFACPP@ prelude.cf
     826$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
    802827
    803828-include $(libdeps)
    804829
    805 prelude.o : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    806         ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -in-tree -XCFA -l ${<} -c -o ${@}
     830prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     831        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    807832
    808833#----------------------------------------------------------------------------------------------------------------
  • src/main.cc

    r72b0573 re523b07  
    172172                        if ( filename == nullptr ) filename = argv[ optind ];
    173173                        // prelude filename comes in differently
    174                         if ( libcfap ) filename = "prelude.cf";
     174                        if ( libcfap ) filename = "prelude.cfa";
    175175                        optind += 1;
    176176                } else {                                                                                // no input file name
     
    199199                        if ( ! libcfap ) {
    200200                                // read the prelude in, if not generating the cfa library
    201                                 FILE * prelude = fopen( (PreludeDirector + "/prelude.cf").c_str(), "r" );
    202                                 assertf( prelude, "cannot open prelude.cf\n" );
     201                                FILE * prelude = fopen( (PreludeDirector + "/prelude.cfa").c_str(), "r" );
     202                                assertf( prelude, "cannot open prelude.cfa\n" );
    203203                                parse( prelude, LinkageSpec::Intrinsic );
    204204
Note: See TracChangeset for help on using the changeset viewer.