Skip to content

Commit 9d5c559

Browse files
committed
Fix BaseTools build issue in Windows
This fixed the EDK2 BaseTools build issue. It also used Windows 10 SDK instead of Windows 8.1. Signed-off-by: Maurice Ma <maurice.ma@intel.com>
1 parent 65863ac commit 9d5c559

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

BuildNetboot.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def rebuild_basetools ():
4040

4141
if not check_files_exist (exe_list, os.path.join(edk_dir, 'BaseTools', 'Bin', 'Win32'), '.exe'):
4242
print ("Could not find pre-built BaseTools binaries, try to rebuild BaseTools ...")
43-
ret = run_process (['BaseTools/toolsetup.bat', 'forcerebuild'])
43+
ret = run_process (['BaseTools\\toolsetup.bat', 'forcerebuild'])
4444

4545
if ret:
4646
print ("Build BaseTools failed, please check required build environment and utilities !")
@@ -69,7 +69,7 @@ def prep_env (edk2_dir, toolchain_preferred = ''):
6969
os.environ['PATH'] = os.environ['PATH'] + ';' + os.path.join(edk2_dir, 'BaseTools', 'Bin', 'Win32')
7070
os.environ['PATH'] = os.environ['PATH'] + ';' + os.path.join(edk2_dir, 'BaseTools', 'BinWrappers', 'WindowsLike')
7171
os.environ['PYTHONPATH'] = os.path.join(edk2_dir, 'BaseTools', 'Source', 'Python')
72-
os.environ['WINSDK_PATH_FOR_RC_EXE'] = r'C:\Program Files (x86)\Windows Kits\8.1\bin\x86'
72+
os.environ['WINSDK_PATH_FOR_RC_EXE'] = r'C:\Program Files (x86)\Windows Kits\10\bin\x86'
7373
else:
7474
os.environ['PATH'] = os.environ['PATH'] + ':' + os.path.join(edk2_dir, 'BaseTools', 'BinWrappers', 'PosixLike')
7575
os.environ['EDK_TOOLS_PATH'] = os.path.join(edk2_dir, 'BaseTools')
@@ -85,10 +85,9 @@ def main():
8585

8686
ap = argparse.ArgumentParser()
8787
sp = ap.add_subparsers(help='command')
88-
edk2_dir = os.getcwd() + '/Edk2'
88+
edk2_dir = os.path.abspath(os.getcwd() + '/Edk2')
8989
branch = 'edk2-stable202102'
9090

91-
9291
def cmd_build_dsc(args):
9392
if not os.path.exists (edk2_dir):
9493
clone_repo (edk2_dir, 'http://github.com/tianocore/edk2.git', branch)

0 commit comments

Comments
 (0)