From d56e92d50e9c980068288230c48aa7f284db2d1d Mon Sep 17 00:00:00 2001 From: Marcel Telka <marcel@telka.sk> Date: Thu, 22 Sep 2022 20:21:50 +0200 Subject: [PATCH] Drop support for parfait --- make-rules/shared-macros.mk | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/make-rules/shared-macros.mk b/make-rules/shared-macros.mk index 6b2208c..ad77622 100644 --- a/make-rules/shared-macros.mk +++ b/make-rules/shared-macros.mk @@ -554,11 +554,6 @@ # BUILD_TOOLS is the root of all tools not normally installed on the system. BUILD_TOOLS ?= /opt -PARFAIT_ROOT = $(BUILD_TOOLS)/parfait/parfait-tools-1.0.1/ -PARFAIT= $(PARFAIT_ROOT)/bin/parfait -export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc -export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++ - # # The CCACHE makefile variable should evaluate to empty string or a pathname # like /usr/bin/ccache depending on your PATH value and "which" implementation. @@ -685,14 +680,6 @@ PYTHON.3.9.VENDOR_PACKAGES.64 = /usr/lib/python3.9/vendor-packages PYTHON.3.9.VENDOR_PACKAGES.32 = /usr/lib/python3.9/vendor-packages PYTHON.3.9.VENDOR_PACKAGES = $(PYTHON.3.9.VENDOR_PACKAGES.$(BITS)) - -ifeq ($(strip $(PARFAIT_BUILD)),yes) -CC.gcc.32 = $(WS_TOOLS)/parfait/gcc -CXX.gcc.32 = $(WS_TOOLS)/parfait/g++ -CC.gcc.64 = $(WS_TOOLS)/parfait/gcc -CXX.gcc.64 = $(WS_TOOLS)/parfait/g++ -LD = $(WS_TOOLS)/parfait/ld -endif CC = $(CC.$(COMPILER).$(BITS)) CXX = $(CXX.$(COMPILER).$(BITS)) @@ -1260,7 +1247,7 @@ COMPONENT_INSTALL_ARGS += $(COMPONENT_INSTALL_ARGS.$(BITS)) # declare these phony so that we avoid filesystem conflicts. -.PHONY: prep build install publish test clean clobber parfait +.PHONY: prep build install publish test clean clobber # If there are no tests to execute NO_TESTS = test-nothing -- Gitblit v1.9.3