From 24959196114fe00c1abc8ac5a4ec0ebe230c7586 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Wed, 3 Mar 2021 15:53:02 +0100 Subject: [PATCH] (re-)enable 32 bit SL6 cross build --- configure/os/CONFIG.Common.SL6-x86 | 3 +++ configure/os/CONFIG_SITE.RHEL7-x86_64.Common | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure/os/CONFIG.Common.SL6-x86 b/configure/os/CONFIG.Common.SL6-x86 index 434c55396..72b37b20a 100644 --- a/configure/os/CONFIG.Common.SL6-x86 +++ b/configure/os/CONFIG.Common.SL6-x86 @@ -2,3 +2,6 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86 ARCH_DEP_CFLAGS += -march=i686 + +# have no full C++11 +STD_CXXFLAGS = -std=c++0x diff --git a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common index e39b71f94..b4fefc1c2 100644 --- a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common @@ -7,12 +7,11 @@ CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64 # Build for old SL6 32 bit -#CROSS_COMPILER_TARGET_ARCHS += SL6-x86 - -# WINE MSVC -CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64 +CROSS_COMPILER_TARGET_ARCHS += SL6-x86 # NI Linux Real-Time 7.x # requires RPM gcc-c++-arm-linux-gnu CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a +# Windows cross builds using Wine +CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64