diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2026-02-11 10:00:05 -0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2026-02-11 22:53:29 +0000 |
| commit | 12f785f106216eedbedb02427255e257d506367f (patch) | |
| tree | a03deedfa139fbdbb9c57b43fb20ae83ccd1721b /BaseTools/Source/C/Makefiles | |
| parent | e1c56cf5d54f469dece5c2678c1ea6841b4fe4fa (diff) | |
| download | edk2-master.tar.gz edk2-master.tar.bz2 edk2-master.zip | |
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/C/Makefiles')
| -rw-r--r-- | BaseTools/Source/C/Makefiles/app.makefile | 9 | ||||
| -rw-r--r-- | BaseTools/Source/C/Makefiles/footer.makefile | 25 | ||||
| -rw-r--r-- | BaseTools/Source/C/Makefiles/header.makefile | 13 | ||||
| -rw-r--r-- | BaseTools/Source/C/Makefiles/lib.makefile | 8 |
4 files changed, 15 insertions, 40 deletions
diff --git a/BaseTools/Source/C/Makefiles/app.makefile b/BaseTools/Source/C/Makefiles/app.makefile index 475cb88d04..b66e564b3b 100644 --- a/BaseTools/Source/C/Makefiles/app.makefile +++ b/BaseTools/Source/C/Makefiles/app.makefile @@ -6,19 +6,16 @@ #
MAKEROOT ?= ../..
-BUILDROOT ?= $(MAKEROOT)
-OBJDIR ?= .
-OBJECTS := $(addprefix $(OBJDIR)/,$(OBJECTS))
include $(MAKEROOT)/Makefiles/header.makefile
-APPLICATION = $(BUILDROOT)/bin/$(APPNAME)
+APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
.PHONY:all
-all: $(BUILDROOT)/bin $(APPLICATION)
+all: $(MAKEROOT)/bin $(APPLICATION)
$(APPLICATION): $(OBJECTS)
- $(LINKER) -o $(APPLICATION) $(LDFLAGS) $(OBJECTS) -L$(BUILDROOT)/libs $(LIBS)
+ $(LINKER) -o $(APPLICATION) $(LDFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)
ifeq (Windows, $(findstring Windows,$(OS)))
$(CP) $(APPLICATION).exe $(BIN_PATH)
endif
diff --git a/BaseTools/Source/C/Makefiles/footer.makefile b/BaseTools/Source/C/Makefiles/footer.makefile index 7d608a5e82..9a3dfcd494 100644 --- a/BaseTools/Source/C/Makefiles/footer.makefile +++ b/BaseTools/Source/C/Makefiles/footer.makefile @@ -7,37 +7,24 @@ DEPFILES = $(OBJECTS:%.o=%.d)
-$(BUILDROOT)/libs-$(HOST_ARCH):
- $(MD) $(BUILDROOT)/libs-$(HOST_ARCH)
+$(MAKEROOT)/libs-$(HOST_ARCH):
+ $(MD) $(MAKEROOT)/libs-$(HOST_ARCH)
.PHONY: install
-install: $(BUILDROOT)/libs-$(HOST_ARCH) $(LIBRARY)
- $(CP) $(LIBRARY) $(BUILDROOT)/libs-$(HOST_ARCH)
+install: $(MAKEROOT)/libs-$(HOST_ARCH) $(LIBRARY)
+ $(CP) $(LIBRARY) $(MAKEROOT)/libs-$(HOST_ARCH)
$(LIBRARY): $(OBJECTS)
$(AR) crs $@ $^
-$(OBJDIR)/%.o : %.c
- @$(MD) $(@D)
+%.o : %.c
$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
-$(OBJDIR)/%.o : %.cpp
- @$(MD) $(@D)
+%.o : %.cpp
$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
-$(OBJECTS): | $(OBJDIR)
-
-$(OBJDIR)/%.d : %.c
- @set -e; rm -f $@; \
- $(MD) $(@D); \
- $(CC) -M $(CPPFLAGS) $< > $@.$$$$; \
- sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
- rm -f $@.$$$$
-
.PHONY: clean
clean:
$(RM) $(OBJECTS) $(LIBRARY) $(DEPFILES)
-ifneq ($(MAKECMDGOALS), clean)
-include $(DEPFILES)
-endif
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile index 286bc5235d..d63f487724 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile @@ -206,16 +206,11 @@ LDFLAGS += $(EXTRA_LDFLAGS) all:
-$(BUILDROOT)/libs:
- $(MD) $(BUILDROOT)/libs
+$(MAKEROOT)/libs:
+ $(MD) $(MAKEROOT)/libs
-$(BUILDROOT)/bin:
- $(MD) $(BUILDROOT)/bin
+$(MAKEROOT)/bin:
+ $(MD) $(MAKEROOT)/bin
ifeq (Windows, $(findstring Windows,$(OS)))
$(MD) $(BIN_PATH)
endif
-
-ifdef OBJDIR
-$(OBJDIR):
- $(MD) $(OBJDIR)
-endif
diff --git a/BaseTools/Source/C/Makefiles/lib.makefile b/BaseTools/Source/C/Makefiles/lib.makefile index e2186b6863..2577c15380 100644 --- a/BaseTools/Source/C/Makefiles/lib.makefile +++ b/BaseTools/Source/C/Makefiles/lib.makefile @@ -5,14 +5,10 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent
#
-BUILDROOT ?= $(MAKEROOT)
-OBJDIR ?= .
-OBJECTS := $(addprefix $(OBJDIR)/,$(OBJECTS))
-
include $(MAKEROOT)/Makefiles/header.makefile
-LIBRARY = $(BUILDROOT)/libs/lib$(LIBNAME).a
+LIBRARY = $(MAKEROOT)/libs/lib$(LIBNAME).a
-all: $(BUILDROOT)/libs $(LIBRARY)
+all: $(MAKEROOT)/libs $(LIBRARY)
include $(MAKEROOT)/Makefiles/footer.makefile
|