From 20462efe9389cdf862a8221691f73d4cafd5e899 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 20 Mar 2015 02:07:26 +0000
Subject: [PATCH] =?UTF-8?q?build.sh=E3=81=A7ConsoleBackup=E3=81=8C?=
 =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=A7=E3=81=8D=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@845 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile | 4 +++-
 trunk/ConsoleDataMigration/sources/build.sh                 | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile b/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile
index 64029d4..d774ec6 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile
@@ -73,7 +73,9 @@ SHADER_PATH         =   $(ROMFS_ROOT)/$(SHADER_BIN)
 
 ROMFS_DEPENDENCIES  =   $(SHADER_PATH)
 
-EXCLUDE_LIBS       +=   libnn_olv
+if $(defined-env BUILD_FOR_RESTORE)
+	EXCLUDE_LIBS       +=   libnn_olv
+	export
 
 LIBS               +=   libnn_cfg \
                         libnn_crypto \
diff --git a/trunk/ConsoleDataMigration/sources/build.sh b/trunk/ConsoleDataMigration/sources/build.sh
index b717023..be4ec56 100755
--- a/trunk/ConsoleDataMigration/sources/build.sh
+++ b/trunk/ConsoleDataMigration/sources/build.sh
@@ -10,6 +10,7 @@
 
 set -u
 set -e
+#set -x
 
 # バージョン取得
 function getVersion
@@ -79,6 +80,7 @@ function buildBackupAndRestore
     buildCore "$BuildExec"
     cd ../
     cd ConsoleRestore
+    export BUILD_FOR_RESTORE=true
     export HORIZON_ROOT=$HORIZON_ROOT_RESTORE
     buildCore "$BuildExec"
     cd ../
@@ -108,6 +110,9 @@ function buildAutoTest
 }
 
 #################### 通常ビルド ####################
+# ビルドフラグ削除
+unset BUILD_FOR_RESTORE
+
 # ConsoleBackup、ConsoleRestoreのビルド
 buildBackupAndRestore