Changeset 37fe352 for libcfa/prelude


Ignore:
Timestamp:
Aug 5, 2018, 4:11:41 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:
28582b2
Parents:
4dcaed2
Message:

Added proper multi-lib handling, tests still do not work and arm support is broken

Location:
libcfa/prelude
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • libcfa/prelude/Makefile.am

    r4dcaed2 r37fe352  
    2424
    2525CC = @CFACC@
     26AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@
    2627
    2728$(DEPDIR) :
    … …  
    3334# create extra forward types/declarations to reduce inclusion of library files
    3435extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c
    35         ${AM_V_GEN}gcc -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf
     36        ${AM_V_GEN}gcc ${AM_CFLAGS} -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf
    3637
    3738# create forward declarations for gcc builtins
    … …  
    4344
    4445prelude.cf : prelude-gen.cc
    45         ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
     46        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
    4647        @./prelude-gen > $@
    4748        @rm ./prelude-gen
    … …  
    5354# create forward declarations for cfa builtins
    5455builtins.cf : builtins.c ${CC}
    55         ${AM_V_GEN}${CC} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
     56        ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
    5657        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
    5758
    … …  
    6768        rm -rf $(DEPDIR)
    6869
    69 MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf builtins.cf extras.cf bootloader.c prelude.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
     70MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf
     71MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}

  • libcfa/prelude/Makefile.in

    r4dcaed2 r37fe352  
    9090PRE_UNINSTALL = :
    9191POST_UNINSTALL = :
    92 build_triplet = @build@
    93 host_triplet = @host@
    9492subdir = prelude
    9593ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    96 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     94am__aclocal_m4_deps = $(top_srcdir)/../automake/cfa.m4 \
     95        $(top_srcdir)/configure.ac
    9796am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    9897        $(ACLOCAL_M4)
    … …  
    155154AMTAR = @AMTAR@
    156155AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
     156ARCHITECTURE = @ARCHITECTURE@
     157ARCH_FLAGS = @ARCH_FLAGS@
    157158AUTOCONF = @AUTOCONF@
    158159AUTOHEADER = @AUTOHEADER@
    … …  
    169170CFA_INCDIR = @CFA_INCDIR@
    170171CFA_LIBDIR = @CFA_LIBDIR@
     172CFA_NAME = @CFA_NAME@
    171173CFA_PREFIX = @CFA_PREFIX@
    172174CFLAGS = @CFLAGS@
    … …  
    221223am__untar = @am__untar@
    222224bindir = @bindir@
    223 build = @build@
    224225build_alias = @build_alias@
    225 build_cpu = @build_cpu@
    226 build_os = @build_os@
    227 build_vendor = @build_vendor@
    228226builddir = @builddir@
    229227datadir = @datadir@
    … …  
    232230dvidir = @dvidir@
    233231exec_prefix = @exec_prefix@
    234 host = @host@
    235232host_alias = @host_alias@
    236 host_cpu = @host_cpu@
    237 host_os = @host_os@
    238 host_vendor = @host_vendor@
    239233htmldir = @htmldir@
    240234includedir = @includedir@
    … …  
    269263cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    270264noinst_DATA = ../src/prelude.c
    271 MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf builtins.cf extras.cf bootloader.c prelude.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
     265AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@
     266MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf
     267MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    272268all: all-am
    273269
    … …  
    387383        fi
    388384mostlyclean-generic:
     385        -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
    389386
    390387clean-generic:
    … …  
    490487# create extra forward types/declarations to reduce inclusion of library files
    491488extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c
    492         ${AM_V_GEN}gcc -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf
     489        ${AM_V_GEN}gcc ${AM_CFLAGS} -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf
    493490
    494491# create forward declarations for gcc builtins
    … …  
    500497
    501498prelude.cf : prelude-gen.cc
    502         ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
     499        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
    503500        @./prelude-gen > $@
    504501        @rm ./prelude-gen
    … …  
    510507# create forward declarations for cfa builtins
    511508builtins.cf : builtins.c ${CC}
    512         ${AM_V_GEN}${CC} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
     509        ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
    513510        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
    514511
Note: See TracChangeset for help on using the changeset viewer.