diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2026-02-11 21:00:05 +0300 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2026-02-12 01:53:29 +0300 |
| commit | 12f785f106216eedbedb02427255e257d506367f (patch) | |
| tree | a03deedfa139fbdbb9c57b43fb20ae83ccd1721b /BaseTools/Source/Python | |
| parent | e1c56cf5d54f469dece5c2678c1ea6841b4fe4fa (diff) | |
| download | edk2-12f785f106216eedbedb02427255e257d506367f.tar.xz | |
Revert "BaseTools: Add support for out-of-tree builds"
This reverts commit 3fe1d56cc98e011bbde8348f13dfa5e38c95f49e.
PR https://github.com/tianocore/edk2/pull/11757 introduced a
"Breaking Change" feature for out of tree builds of tools.
This breaking change is blocking testing of edk2-stable202602
due to side effects on building FitGen tool in edk2-platforms.
Revert this feature for the edk2-stable202602 release and
work on this feature after the release.
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Diffstat (limited to 'BaseTools/Source/Python')
| -rw-r--r-- | BaseTools/Source/Python/Workspace/DscBuildData.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py index ddb576fdeb..014f6d0805 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -2942,8 +2942,7 @@ class DscBuildData(PlatformBuildClassObject): else:
AppSuffix = '.exe' if sys.platform == "win32" else ''
MakeApp = MakeApp + PcdGccMakefile
- MakeApp = MakeApp + 'OBJDIR = %s\n' % self.OutputPath
- MakeApp = MakeApp + 'APPFILE = %s%s%s%s\n' % (self.OutputPath, os.sep, PcdValueInitName, AppSuffix) + 'APPNAME = %s\n' % (PcdValueInitName) + 'OBJECTS = %s.o %s.o\n' % (PcdValueInitName, PcdValueCommonName) + \
+ MakeApp = MakeApp + 'APPFILE = %s%s%s%s\n' % (self.OutputPath, os.sep, PcdValueInitName, AppSuffix) + 'APPNAME = %s\n' % (PcdValueInitName) + 'OBJECTS = %s/%s.o %s.o\n' % (self.OutputPath, PcdValueInitName, os.path.join(self.OutputPath, PcdValueCommonName)) + \
'include $(MAKEROOT)/Makefiles/app.makefile\n' + 'TOOL_INCLUDE +='
IncSearchList = []
|