Ignore:
Timestamp:
Aug 5, 2018, 4:11:41 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
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, 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/configure.ac

    r4dcaed2 r37fe352  
    66AC_CONFIG_AUX_DIR([./automake])
    77
     8m4_include([../automake/cfa.m4])
     9
    810AM_INIT_AUTOMAKE([subdir-objects])
    911
     
    1214AC_ARG_PROGRAM
    1315
    14 AC_CANONICAL_BUILD
    15 AC_CANONICAL_HOST
    16 
     16AC_ARG_VAR(ARCHITECTURE,  [The architecture  to use when building libcfa])
    1717AC_ARG_VAR(CONFIGURATION, [The configuration to use when building libcfa, options are: deubg, nodebug, nolib (prelude-only)])
    1818AC_ARG_VAR(DRIVER_DIR, [The path to the cforall driver directory])
     
    2323AC_SUBST(CFACPP)
    2424
     25case $ARCHITECTURE in
     26        "x64"        ) ARCH_FLAGS="-m64";;
     27        "x86"        ) ARCH_FLAGS="-m32";;
     28        "arm"        ) ARCH_FLAGS="";;
     29esac
     30
     31AC_SUBST(ARCH_FLAGS)
     32
     33#==============================================================================
     34#Trasforming cc1 will break compilation
     35M4CFA_PROGRAM_NAME
     36
    2537#==============================================================================
    2638# Installation paths
    27 if test "x$prefix" = "xNONE"; then
    28         cfa_prefix=${ac_default_prefix}
    29 else
    30         cfa_prefix=${prefix}
    31 fi
    32 AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
    33 AC_SUBST(CFA_PREFIX, ${cfa_prefix})
    34 
    35 if test "$includedir" = '${prefix}/include'; then
    36         cfa_incdir="${cfa_prefix}/include/${cfa_name}"
    37 else
    38         cfa_incdir=${includedir}
    39 fi
    40 AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
    41 AC_SUBST(CFA_INCDIR, ${cfa_incdir})
    42 
    43 if test "$bindir" = '${exec_prefix}/bin'; then
    44         cfa_bindir="${cfa_prefix}/bin"
    45 else
    46         cfa_bindir=${bindir}
    47 fi
    48 AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
    49 AC_SUBST(CFA_BINDIR, ${cfa_bindir})
    50 
    51 if test "$libdir" = '${exec_prefix}/lib'; then
    52         cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
    53 else
    54         cfa_libdir=${libdir}
    55 fi
    56 AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
    57 AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
     39M4CFA_PARSE_PREFIX
    5840
    5941# Checks for programs.
Note: See TracChangeset for help on using the changeset viewer.