diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /devel/gnu-efi/files/patch-Make.defaults | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'devel/gnu-efi/files/patch-Make.defaults')
| -rw-r--r-- | devel/gnu-efi/files/patch-Make.defaults | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/devel/gnu-efi/files/patch-Make.defaults b/devel/gnu-efi/files/patch-Make.defaults index 68fcca4b0c84..8d0d6b7ee7a7 100644 --- a/devel/gnu-efi/files/patch-Make.defaults +++ b/devel/gnu-efi/files/patch-Make.defaults @@ -1,14 +1,8 @@ ---- Make.defaults.orig 2019-10-28 11:48:52 UTC +--- Make.defaults.orig 2024-03-22 13:38:35 UTC +++ Make.defaults -@@ -45,11 +45,14 @@ TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PW - # Where to install the package. GNU-EFI will create and access - # lib and include under the root - # --INSTALLROOT := / -+INSTALLROOT := $(DESTDIR) - PREFIX := /usr/local - LIBDIR := $(PREFIX)/lib - INSTALL := install +@@ -64,6 +64,9 @@ INSTALL := install + INCLUDEDIR := $(PREFIX)/include + INSTALL := install +LOCALBASE := /usr/local +CROSS_COMPILE:= $(LOCALBASE)/bin/ @@ -16,21 +10,3 @@ # Compilation tools HOSTCC := $(prefix)gcc CC := $(prefix)$(CROSS_COMPILE)gcc -@@ -110,10 +113,14 @@ ifeq ($(ARCH),x86_64) - || ( [ $(GCCVERSION) -eq "4" ] \ - && [ $(GCCMINOR) -ge "7" ] ) ) \ - && echo 1) -- ifeq ($(GCCNEWENOUGH),1) -- CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11 -- else ifeq ($(USING_CLANG),clang) -+ ifeq ($(USING_CLANG),clang) - CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11 -+ else -+ ifeq ($(GCCNEWENOUGH),1) -+ CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11 -+ else -+ CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11 -+ endif - endif - - CFLAGS += -mno-red-zone |