Просмотр исходного кода

Merge pull request #199 from bmx-ng/task/cross-compile-fix

Fixes cross-compile builds.
Brucey 8 месяцев назад
Родитель
Сommit
d9cca3d971
1 измененных файлов с 13 добавлено и 8 удалено
  1. 13 8
      src/scripts/build_release.sh

+ 13 - 8
src/scripts/build_release.sh

@@ -824,12 +824,16 @@ build_apps() {
 				exit -1
 			fi
 			cp temp/BlitzMax/src/bcc/bcc$C_EXT release/BlitzMax/bin
-			# build using the latest bcc
-			cp temp/BlitzMax/src/bcc/bcc$C_EXT temp/BlitzMax/bin
+
+			if [ -z "$CROSS_COMPILE" ];then
+				echo "Copying latest bcc to bin"
+				# build using the latest bcc
+				cp temp/BlitzMax/src/bcc/bcc$C_EXT temp/BlitzMax/bin
+			fi
 
 			# clean build with the latest modules
 			echo ""
-			echo "Reset modules to rebuilt them with new bcc"
+			echo "Resetting modules to compile with latest bcc"
 			rm -rf temp/BlitzMax/mod
 			cp -R release/BlitzMax/mod temp/BlitzMax
 
@@ -844,11 +848,12 @@ build_apps() {
 			cp temp/BlitzMax/src/bmk/core.bmk release/BlitzMax/bin && \
 			cp temp/BlitzMax/src/bmk/custom.bmk release/BlitzMax/bin && \
 			cp temp/BlitzMax/src/bmk/make.bmk release/BlitzMax/bin
-			# build using the latest bmk
-			cp temp/BlitzMax/src/bmk/bmk$C_EXT temp/BlitzMax/bin && \
-			cp temp/BlitzMax/src/bmk/core.bmk temp/BlitzMax/bin && \
-			cp temp/BlitzMax/src/bmk/custom.bmk temp/BlitzMax/bin && \
-			cp temp/BlitzMax/src/bmk/make.bmk temp/BlitzMax/bin
+
+			if [ -z "$CROSS_COMPILE" ];then
+				echo "Copying latest bmk to bin"
+				# build using the latest bmk
+				cp temp/BlitzMax/src/bmk/bmk$C_EXT temp/BlitzMax/bin
+			fi
 
 			# build bootstrap
 			if [ ! -z "$BUILD_BOOTSTRAP" ];then