make interfaces-and-libraries.sh handle PEFBinaryFormat.h

build-toolchain.bash

@@ -319,7 +319,7 @@ fi # SKIP_THIRDPARTY
 echo "Building host-based tools..."
 
 # Copy PEFBinaryFormat.h from Universal Interfaces, needed by MakePEF & MakeImport
-(export LC_ALL=C; sed 's/\r$//' < "$CINCLUDES/PEFBinaryFormat.h" | tr '\r' '\n' > "$PREFIX/include/PEFBinaryFormat.h")
+setupPEFBinaryFormat
 
 mkdir -p build-host
 cd build-host

interfaces-and-libraries.sh

@@ -150,6 +150,11 @@ function linkheaders()
 	(cd "$1" && find "../../CIncludes/" -name '*.h' -exec ln -s {} . \;)
 }
 
+function setupPEFBinaryFormat()
+{
+	(export LC_ALL=C; sed 's/\r$//' < "$CINCLUDES/PEFBinaryFormat.h" | tr '\r' '\n' > "$PREFIX/include/PEFBinaryFormat.h")
+}
+
 function setUpInterfacesAndLibraries()
 {
 	echo "Preparing CIncludes..."
@@ -252,6 +257,7 @@ function removeInterfacesAndLibraries()
 		rm -rf "$PREFIX/CIncludes"
 		rm -rf "$PREFIX/RIncludes"
 		rm "$FILE_LIST"
+		rm "$PREFIX/include/PEFBinaryFormat.h"
 	fi
 }
 
@@ -277,6 +283,7 @@ if [ "$0" = "$BASH_SOURCE" ]; then
 	else
 		locateAndCheckInterfacesAndLibraries
 		removeInterfacesAndLibraries
+        setupPEFBinaryFormat
 		setUpInterfacesAndLibraries
 	fi
 fi