From fed6c5446470a9cbf15a40a948223ef1a1870e59 Mon Sep 17 00:00:00 2001
From: Roman Rusyaev <rusyaev.rm@gmail.com>
Date: Mon, 25 Apr 2022 18:15:53 +0300
Subject: [PATCH] Fix failed build

* add missed header
* fix version of qemu
* add missed option in build configs
---
 Makefile                            | 4 +++-
 build/config/BUILDCONFIG.gn         | 1 +
 src/mapleall/maple_me/src/irmap.cpp | 2 ++
 tools/setup_tools.sh                | 8 ++++----
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 9f4db91c47..71227d9d4d 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ BUILD_VERSION := $(MAPLE_BUILD_VERSION)
 GIT_REVISION := $(shell  git log --pretty=format:"%H" -1)
 MAST := 0
 ASAN := 0
+ONLY_C := 0
 ifeq ($(DEBUG),0)
   BUILD_TYPE := RELEASE
 else
@@ -56,7 +57,8 @@ GN_OPTIONS := \
   BUILD_VERSION="$(BUILD_VERSION)" \
   GIT_REVISION="$(GIT_REVISION)" \
   MAST=$(MAST) \
-  ASAN=$(ASAN)
+  ASAN=$(ASAN) \
+  ONLY_C=$(ONLY_C)
 
 .PHONY: default
 default: install
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 5f0817677a..efe75a739d 100755
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -32,6 +32,7 @@ declare_args() {
   GIT_REVISION = ""
   MAST = 0
   ASAN = 0
+  ONLY_C = 0
 }
 
 # Define global args
diff --git a/src/mapleall/maple_me/src/irmap.cpp b/src/mapleall/maple_me/src/irmap.cpp
index cdc39cd369..73d16afe8b 100644
--- a/src/mapleall/maple_me/src/irmap.cpp
+++ b/src/mapleall/maple_me/src/irmap.cpp
@@ -19,6 +19,8 @@
 #include "constantfold.h"
 #include "cast_opt.h"
 
+#include <optional>
+
 namespace maple {
 void IRMap::UpdateIncDecAttr(MeStmt &meStmt) {
   if (!kOpcodeInfo.AssignActualVar(meStmt.GetOp())) {
diff --git a/tools/setup_tools.sh b/tools/setup_tools.sh
index a8672855b9..42d3d70a1f 100755
--- a/tools/setup_tools.sh
+++ b/tools/setup_tools.sh
@@ -149,12 +149,12 @@ if [ ! -f $TOOLS/qemu/usr/bin/qemu-aarch64 ]; then
   rm -rf qemu
   mkdir -p qemu
   if [ "$OLD_OS" == "1" ];then
-    wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb --no-check-certificate
-    dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb qemu
+    wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.11+dfsg-1ubuntu7.39_amd64.deb --no-check-certificate
+    dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.39_amd64.deb qemu
   else
     # we will use QEMU 2.11 for now, and will upgrade it to a new version after further investigations
-    wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb --no-check-certificate
-    dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.37_amd64.deb qemu
+    wget http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu/qemu-user_2.11+dfsg-1ubuntu7.39_amd64.deb --no-check-certificate
+    dpkg-deb -R qemu-user_2.11+dfsg-1ubuntu7.39_amd64.deb qemu
   fi
   echo Installed qemu-aarch64
 fi
-- 
Gitee