diff options
| author |   Damjan Marion <damarion@cisco.com> | 2020-04-29 21:28:15 +0200 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2020-04-30 13:25:29 +0200 |
| commit | 162330f25aeec09694fffaaa31ba9b318620eb9c (patch) | |
| tree | 4c7a10aae7b2e5d54ef21260d08ad3671d44b061 /build-data | |
| parent | dc0ded7dd7a6b8ee68df25cd56666de804e55e64 (diff) | |
build: rework x86 CPU variants
Type: improvement
Change-Id: Ief243f88e654e578ef9b8060fcf535b364aececb
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'build-data')
| -rw-r--r-- | build-data/packages/libmemif.mk | 4 | ||||
| -rw-r--r-- | build-data/packages/sample-plugin.mk | 4 | ||||
| -rw-r--r-- | build-data/packages/vom.mk | 4 | ||||
| -rw-r--r-- | build-data/packages/vpp.mk | 4 |
4 files changed, 8 insertions, 8 deletions
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),) |