File tree Expand file tree Collapse file tree 1 file changed +7
-8
lines changed
Expand file tree Collapse file tree 1 file changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -76,6 +76,7 @@ sub promptUserYN {
7676my $amd64 ;
7777my $ppc ;
7878my $arm7 ;
79+ my $arm8 ;
7980# Determine architecture (x86, ppc, ...)
8081if ($cpu =~ m / i[0-9] 86/ ){
8182 $x86 = 1;
@@ -85,7 +86,9 @@ sub promptUserYN {
8586 $ppc = 1;
8687} elsif ($cpu =~ m / ppc*/ ){
8788 $ppc = 1;
88- } elsif ($cpu =~ m / arm7/ ){
89+ } elsif ($cpu =~ m / aarch64*/ || $cpu =~ m / arm64*/ ){
90+ $arm8 = 1;
91+ } elsif ($cpu =~ m / arm7/ || $cpu =~ m / armv7*/ || $cpu =~ m / armv6*/ ){
8992 $arm7 = 1;
9093}
9194
@@ -341,22 +344,18 @@ sub promptUserYN {
341344 $arch = $arch . " -x86_64" ;
342345 } elsif ($ppc ){
343346 $arch = $arch . " -ppc64le" ;
347+ } elsif ($arm8 ){
348+ $arch = $arch . " -arm8" ;
344349 } elsif ($arm7 ){
345350 $arch = $arch . " -arm7" ;
346351 }
347352}
348353
349- # Fixup $arch to match the inconsistent directories in src/archs
350-
351- if ($arch eq " netlrts-darwin" ){
352- $arch = " netlrts-darwin-x86_64" ;
353- }
354-
355354
356355# ================ Choose SMP/PXSHM =================================
357356
358357# find what options are available
359- my $opts = ` $dirname /build charm++ $arch help 2>&1 | grep "Supported options"` ;
358+ my $opts = ` $dirname /buildold charm++ $arch help 2>&1 | grep "Supported options"` ;
360359$opts =~ m / Supported options: (.*)/ ;
361360$opts = $1 ;
362361
You can’t perform that action at this time.
0 commit comments