From 05d49b78ab509a8c8ea6d720713da099fd2ea40e Mon Sep 17 00:00:00 2001
From: jief <github-prf@jf-luce.name>
Date: Mon, 20 Apr 2020 08:26:50 +0300
Subject: [PATCH] Make mtoc path generic.

---
 Xcode/CloverX64/clang-slink | 3 ++-
 ebuild.sh                   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Xcode/CloverX64/clang-slink b/Xcode/CloverX64/clang-slink
index 33a40808d..edc26c029 100755
--- a/Xcode/CloverX64/clang-slink
+++ b/Xcode/CloverX64/clang-slink
@@ -66,7 +66,8 @@ ld -arch x86_64 -u __ModuleEntryPoint  -e __ModuleEntryPoint -preload -segalign
 
 
 
-[[ $? == 0 ]] && "$edk2prefix"/../opt/local/bin/mtoc.NEW_jief -subsystem UEFI_APPLICATION  -align 0x20 ./"$outputname".dll ./"$outputname".pecoff
+source "$edk2prefix"/Conf/mtoc_path.txt
+[[ $? == 0 ]] && "$MTOC" -subsystem UEFI_APPLICATION  -align 0x20 ./"$outputname".dll ./"$outputname".pecoff
 
 [[ $? == 0 ]] && dsymutil ./"$outputname".dll
 
diff --git a/ebuild.sh b/ebuild.sh
index 6a1aaf92d..024f17c2a 100755
--- a/ebuild.sh
+++ b/ebuild.sh
@@ -499,6 +499,7 @@ MainBuildScript() {
         set +u
         source ./edksetup.sh BaseTools
         set -u
+        echo "MTOC=$MTOC_PREFIX/mtoc.NEW_jief" > "$WORKSPACE"/Conf/mtoc_path.txt
         cd "$CLOVERROOT"
  #   else
  #       echo "Building from: $WORKSPACE"