From 162330f25aeec09694fffaaa31ba9b318620eb9c Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 29 Apr 2020 21:28:15 +0200 Subject: build: rework x86 CPU variants Type: improvement Change-Id: Ief243f88e654e578ef9b8060fcf535b364aececb Signed-off-by: Damjan Marion --- build-data/packages/libmemif.mk | 4 ++-- build-data/packages/sample-plugin.mk | 4 ++-- build-data/packages/vom.mk | 4 ++-- build-data/packages/vpp.mk | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'build-data/packages') diff --git a/build-data/packages/libmemif.mk b/build-data/packages/libmemif.mk index 9bce09b5f25..acc0d64257f 100644 --- a/build-data/packages/libmemif.mk +++ b/build-data/packages/libmemif.mk @@ -27,8 +27,8 @@ libmemif_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)" libmemif_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../vpp" # Use devtoolset on centos 7 -ifneq ($(wildcard /opt/rh/devtoolset-7/enable),) -libmemif_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-7/root/bin" +ifneq ($(wildcard /opt/rh/devtoolset-9/enable),) +libmemif_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-9/root/bin" endif libmemif_configure = \ diff --git a/build-data/packages/sample-plugin.mk b/build-data/packages/sample-plugin.mk index 77855671b12..34188f9e7a7 100644 --- a/build-data/packages/sample-plugin.mk +++ b/build-data/packages/sample-plugin.mk @@ -31,8 +31,8 @@ sample-plugin_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)" sample-plugin_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../vpp" # Use devtoolset on centos 7 -ifneq ($(wildcard /opt/rh/devtoolset-7/enable),) -sample-plugin_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-7/root/bin" +ifneq ($(wildcard /opt/rh/devtoolset-9/enable),) +sample-plugin_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-9/root/bin" endif sample-plugin_configure = \ diff --git a/build-data/packages/vom.mk b/build-data/packages/vom.mk index fefd49ac841..f284473beb5 100644 --- a/build-data/packages/vom.mk +++ b/build-data/packages/vom.mk @@ -28,8 +28,8 @@ vom_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)" vom_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../vpp" # Use devtoolset on centos 7 -ifneq ($(wildcard /opt/rh/devtoolset-7/enable),) -vom_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-7/root/bin" +ifneq ($(wildcard /opt/rh/devtoolset-9/enable),) +vom_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-9/root/bin" endif vom_configure = \ diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index 6571cd2cf09..bbff1ba564f 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -37,8 +37,8 @@ endif endif # Use devtoolset on centos 7 -ifneq ($(wildcard /opt/rh/devtoolset-7/enable),) -vpp_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-7/root/bin" +ifneq ($(wildcard /opt/rh/devtoolset-9/enable),) +vpp_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-9/root/bin" endif ifneq ($(VPP_EXTRA_CMAKE_ARGS),) -- cgit 1.2.3-korg