Make mtoc path generic.

CloverHackyColor · Apr 20, 2020 · 05d49b7 · 05d49b7 · SergeySlice · Apr 20, 2020
1 parent 2ec6b3f
commit 05d49b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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"