浏览代码

To be on the safe side when detecting 64bit arm #72

Bob Mottram 7 年前
父节点
当前提交
a6ed88fea5
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1
    1
      src/freedombone-image-customise
  2. 2
    2
      src/freedombone-utils-go

+ 1
- 1
src/freedombone-image-customise 查看文件

1167
     if [[ $ARCHITECTURE == *"arm"* ]]; then
1167
     if [[ $ARCHITECTURE == *"arm"* ]]; then
1168
         GOARCH=armv6l
1168
         GOARCH=armv6l
1169
     fi
1169
     fi
1170
-    if [[ $ARCHITECTURE == *"aarch"* ]]; then
1170
+    if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
1171
         GOARCH=arm64
1171
         GOARCH=arm64
1172
     fi
1172
     fi
1173
     if [ ! $GOARCH ]; then
1173
     if [ ! $GOARCH ]; then

+ 2
- 2
src/freedombone-utils-go 查看文件

147
     if [[ $ARCHITECTURE == *"arm"* ]]; then
147
     if [[ $ARCHITECTURE == *"arm"* ]]; then
148
         GOARCH=armv6l
148
         GOARCH=armv6l
149
     fi
149
     fi
150
-    if [[ $ARCHITECTURE == *"aarch"* ]]; then
150
+    if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
151
         GOARCH=arm64
151
         GOARCH=arm64
152
     fi
152
     fi
153
     if [ ! $GOARCH ]; then
153
     if [ ! $GOARCH ]; then
157
             GOARCH=armv6l
157
             GOARCH=armv6l
158
             echo $"Using $GOARCH"
158
             echo $"Using $GOARCH"
159
         fi
159
         fi
160
-        if [[ $ARCHITECTURE == *"aarch"* ]]; then
160
+        if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
161
             GOARCH=arm64
161
             GOARCH=arm64
162
             echo $"Using $GOARCH"
162
             echo $"Using $GOARCH"
163
         fi
163
         fi