Ignore:
Timestamp:
Apr 5, 2012, 2:17:53 AM (8 years ago)
Author:
jeremyhu@…
Message:

Add support for per-arch compiler choices to muniversal

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

    r91555 r91556  
    3939#        merger_configure_args: associative array of configure.args
    4040#            merger_build_args: associative array of build.args
     41#    merger_configure_compiler: associative array of configure.compiler
    4142#    merger_configure_cppflags: associative array of configure.cppflags
    4243#      merger_configure_cflags: associative array of configure.cflags
     
    253254            }
    254255
    255             set configure_cc_save   ${configure.cc}
    256             set configure_cxx_save  ${configure.cxx}
    257             set configure_objc_save ${configure.objc}
    258             set configure_fc_save   ${configure.fc}
    259             set configure_f77_save  ${configure.f77}
    260             set configure_f90_save  ${configure.f90}
     256            set configure_compiler_save ${configure.compiler}
     257            set configure_cc_save       ${configure.cc}
     258            set configure_cxx_save      ${configure.cxx}
     259            set configure_objc_save     ${configure.objc}
     260            set configure_fc_save       ${configure.fc}
     261            set configure_f77_save      ${configure.f77}
     262            set configure_f90_save      ${configure.f90}
     263
     264            if { [info exists merger_configure_compiler($arch)] } {
     265                configure.compiler  $merger_configure_compiler($arch)
     266                configure.cc        [portconfigure::configure_get_compiler cc]
     267                configure.cxx       [portconfigure::configure_get_compiler cxx]
     268                configure.objc      [portconfigure::configure_get_compiler objc]
     269                configure.f77       [portconfigure::configure_get_compiler f77]
     270                configure.f90       [portconfigure::configure_get_compiler f90]
     271                configure.fc        [portconfigure::configure_get_compiler fc]
     272            }
    261273
    262274            if { ${merger_arch_compiler} != "no" } {
     
    298310            eval autoreconf.dir ${autoreconf_dir_save}
    299311            eval configure.dir  ${configure_dir_save}
     312            eval configure.compiler ${configure_compiler_save}
    300313            eval configure.f90  ${configure_f90_save}
    301314            eval configure.f77  ${configure_f77_save}
Note: See TracChangeset for help on using the changeset viewer.