Changeset 37fe352 for configure


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
  • configure

    r4dcaed2 r37fe352  
    25232523
    25242524
     2525
     2526
     2527
     2528
    25252529am__api_version='1.15'
    25262530
     
    30703074#==============================================================================
    30713075#Trasforming cc1 will break compilation
    3072 if test "${program_transform_name}" = ""; then
    3073     as_fn_error $? "Program transform not supported.
    3074                 Use --with-cfa-name='[Desired name here]' instead" "$LINENO" 5
    3075 fi
    3076 
    3077 #Define the new name of the installed command
     3076
     3077        if test "${program_transform_name}" = ""; then
     3078        as_fn_error $? "Program transform not supported.
     3079                        Use --with-cfa-name='[Desired name here]' instead" "$LINENO" 5
     3080        fi
     3081
     3082        #Define the new name of the installed command
    30783083
    30793084# Check whether --with-cfa-name was given.
     
    30853090
    30863091
    3087 CFA_NAME=${cfa_name}
     3092        CFA_NAME=${cfa_name}
    30883093
    30893094
     
    32613266
    32623267        if test "$libdir" = '${exec_prefix}/lib'; then
    3263                 cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
     3268                cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}"
    32643269        else
    3265                 cfa_libdir=${libdir}
     3270                cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
    32663271        fi
    32673272
     
    34153420        arch_name=$(echo $i | sed -r "s/:(.*)//g")
    34163421        lib_config=$(echo $i | sed -r "s/(.*)://g")
    3417         if test $lib_config != "nodebug";
    3418         then
    3419                 if test $lib_config != "debug";
    3420                 then
    3421                         if test $lib_config != "nolib";
    3422                         then
    3423                                 >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
    3424                                 exit 1
    3425                         fi
    3426                 fi
    3427         fi
    3428 
    3429         lib_arch=$($ac_aux_dir/config.sub $arch_name)
    3430         if test "$?" != "0"; then
     3422
     3423        case $lib_config in
     3424                "nodebug") ;;
     3425                "debug") ;;
     3426                "nolib") ;;
     3427                *)
     3428                        >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
     3429                        exit 1
     3430                ;;
     3431        esac
     3432
     3433
     3434        case $arch_name in
     3435                "x64"        ) cannon_arch_name="x64";;
     3436                "x86-64"     ) cannon_arch_name="x64";;
     3437                "x86_64"     ) cannon_arch_name="x64";;
     3438                "x86"        ) cannon_arch_name="x86";;
     3439                "i386"       ) cannon_arch_name="x86";;
     3440                "i486"       ) cannon_arch_name="x86";;
     3441                "i686"       ) cannon_arch_name="x86";;
     3442                "Intel 80386") cannon_arch_name="x86";;
     3443                "arm"        ) cannon_arch_name="arm";;
     3444                "ARM"        ) cannon_arch_name="arm";;
     3445                *)
    34313446                >&2 echo "Unkown architecture " $arch_name;
    3432                 exit 1;
    3433         fi
     3447                exit 1
     3448                ;;
     3449        esac
     3450
     3451        lib_arch=${cannon_arch_name}
    34343452        lib_dir="libcfa-${lib_arch}-${lib_config}"
    34353453
     
    34403458        echo -n "${LIBCFA_GENERAL_ARGS} " > libcfa-${lib_arch}-${lib_config}/config.data
    34413459        echo -n "${LIBCFA_PATHS} " >> libcfa-${lib_arch}-${lib_config}/config.data
    3442         echo -n "--host=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data
     3460        echo -n "ARCHITECTURE=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data
    34433461        echo -n "CONFIGURATION=${lib_config}" >> libcfa-${lib_arch}-${lib_config}/config.data
    34443462done
    34453463
    34463464
     3465
     3466
     3467
     3468        case $arch_name in
     3469                "x64"        ) cannon_arch_name="x64";;
     3470                "x86-64"     ) cannon_arch_name="x64";;
     3471                "x86_64"     ) cannon_arch_name="x64";;
     3472                "x86"        ) cannon_arch_name="x86";;
     3473                "i386"       ) cannon_arch_name="x86";;
     3474                "i486"       ) cannon_arch_name="x86";;
     3475                "i686"       ) cannon_arch_name="x86";;
     3476                "Intel 80386") cannon_arch_name="x86";;
     3477                "arm"        ) cannon_arch_name="arm";;
     3478                "ARM"        ) cannon_arch_name="arm";;
     3479                *)
     3480                >&2 echo "Unkown architecture " $arch_name;
     3481                exit 1
     3482                ;;
     3483        esac
     3484
     3485
     3486cat >>confdefs.h <<_ACEOF
     3487#define CFA_DEFAULT_CPU "$cannon_arch_name"
     3488_ACEOF
     3489
     3490
     3491cat >>confdefs.h <<_ACEOF
     3492#define CFA_64_CPU "x64"
     3493_ACEOF
     3494
     3495
     3496cat >>confdefs.h <<_ACEOF
     3497#define CFA_32_CPU "x86"
     3498_ACEOF
    34473499
    34483500
Note: See TracChangeset for help on using the changeset viewer.