mirror of
https://git.freebsd.org/ports.git
synced 2025-06-06 21:30:31 -04:00
* Makefile PORTVERSION=3.0.11 * files/ patch-Make.defaults: fix using "-maccumulate-outgoing-args" with clang
36 lines
1.2 KiB
Text
36 lines
1.2 KiB
Text
--- Make.defaults.orig 2019-10-28 11:48:52 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
|
|
|
|
+LOCALBASE := /usr/local
|
|
+CROSS_COMPILE:= $(LOCALBASE)/bin/
|
|
+
|
|
# 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
|