Changeset 4dcaed2 for libcfa


Ignore:
Timestamp:
Aug 5, 2018, 1:13:35 PM (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:
37fe352
Parents:
534e4e4
Message:

Added prelude-dir argument for cfa-cpp

Location:
libcfa
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • libcfa/prelude/Makefile.am

    r534e4e4 r4dcaed2  
    5959
    6060../src/prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    61         ${AM_V_GEN}@CFACPP@ -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
     61        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    6262
    6363bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    64         ${AM_V_GEN}@CFACPP@ -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     64        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    6565
    6666maintainer-clean-local :

  • libcfa/prelude/Makefile.in

    r534e4e4 r4dcaed2  
    516516
    517517../src/prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    518         ${AM_V_GEN}@CFACPP@ -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
     518        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    519519
    520520bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    521         ${AM_V_GEN}@CFACPP@ -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     521        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    522522
    523523maintainer-clean-local :

  • libcfa/src/Makefile.am

    r534e4e4 r4dcaed2  
    2828# use -no-include-stdhdr to prevent rebuild cycles
    2929# The built sources must not depend on the installed headers
    30 AM_CFAFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ -imacros prelude.c -I$(srcdir)/stdhdr
     30AM_CFAFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ -XCFA --prelude-dir=$(top_builddir)/prelude -imacros prelude.c -I$(srcdir)/stdhdr
    3131AM_CFLAGS = -g -Wall -Wno-unused-function
    3232CFACC = @CFACC@
    … …  
    4343
    4444# not all platforms support concurrency, add option do disable it
    45 libsrc += concurrency/CtxSwitch-@host_alias@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
     45libsrc += concurrency/CtxSwitch-@host_cpu@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
    4646
    4747# extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing

  • libcfa/src/Makefile.in

    r534e4e4 r4dcaed2  
    151151        interpose.$(OBJEXT) bits/debug.$(OBJEXT) assert.$(OBJEXT) \
    152152        exception.$(OBJEXT) virtual.$(OBJEXT) heap.$(OBJEXT) \
    153         $(am__objects_1) concurrency/CtxSwitch-@host_alias@.$(OBJEXT) \
     153        $(am__objects_1) concurrency/CtxSwitch-@host_cpu@.$(OBJEXT) \
    154154        concurrency/alarm.$(OBJEXT) concurrency/invoke.$(OBJEXT) \
    155155        concurrency/preemption.$(OBJEXT)
    … …  
    344344# use -no-include-stdhdr to prevent rebuild cycles
    345345# The built sources must not depend on the installed headers
    346 AM_CFAFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ -imacros prelude.c -I$(srcdir)/stdhdr
     346AM_CFAFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ -XCFA --prelude-dir=$(top_builddir)/prelude -imacros prelude.c -I$(srcdir)/stdhdr
    347347AM_CFLAGS = -g -Wall -Wno-unused-function
    348348
    … …  
    357357libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
    358358        exception.c virtual.c heap.cfa ${headers:=.cfa} \
    359         concurrency/CtxSwitch-@host_alias@.S concurrency/alarm.cfa \
     359        concurrency/CtxSwitch-@host_cpu@.S concurrency/alarm.cfa \
    360360        concurrency/invoke.c concurrency/preemption.cfa
    361361libcfa_a_SOURCES = ${libsrc}
    … …  
    479479concurrency/mutex.$(OBJEXT): concurrency/$(am__dirstamp) \
    480480        concurrency/$(DEPDIR)/$(am__dirstamp)
    481 concurrency/CtxSwitch-@host_alias@.$(OBJEXT):  \
     481concurrency/CtxSwitch-@host_cpu@.$(OBJEXT):  \
    482482        concurrency/$(am__dirstamp) \
    483483        concurrency/$(DEPDIR)/$(am__dirstamp)
    … …  
    506506@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prelude.Po@am__quote@
    507507@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virtual.Po@am__quote@
    508 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@host_alias@.Po@am__quote@
     508@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@host_cpu@.Po@am__quote@
    509509@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/invoke.Po@am__quote@
    510510
Note: See TracChangeset for help on using the changeset viewer.