From 6c74507b11304546aceb53757d4d257ba5051b5f Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Mon, 6 Nov 2023 17:23:44 +0100 Subject: [PATCH] all our current host OS can build nilrt7-armv7a --- configure/os/CONFIG.Common.nilrt7-armv7a | 8 +++++--- configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a | 1 - configure/os/CONFIG_SITE.RHEL7-x86_64.Common | 5 ----- configure/os/CONFIG_SITE.RHEL8-x86_64.Common | 4 ---- configure/os/CONFIG_SITE.linux-x86_64.Common | 3 +++ 5 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a diff --git a/configure/os/CONFIG.Common.nilrt7-armv7a b/configure/os/CONFIG.Common.nilrt7-armv7a index 6aec571d3..410212d2b 100644 --- a/configure/os/CONFIG.Common.nilrt7-armv7a +++ b/configure/os/CONFIG.Common.nilrt7-armv7a @@ -1,4 +1,5 @@ # National Instruments CompactRIO running LabView RT 19.5.1 +# requires RPM gcc-c++-arm-linux-gnu # Include definitions common to all Linux targets include $(CONFIG)/os/CONFIG.Common.linuxCommon @@ -8,10 +9,11 @@ ARCH_CLASS = arm GNU_TARGET = arm-linux-gnu SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi -GNU_BIN = /bin +GNU_BIN = /opt/RHEL7/bin +LD_LIBRARY_PATH=/usr/$$LIB:/opt/RHEL7/$$LIB ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -ARCH_DEP_CXXFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi/ -ARCH_DEP_CXXFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/ +ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi +ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2 COMMANDLINE_LIBRARY = READLINE_NCURSES diff --git a/configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a b/configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a deleted file mode 100644 index b98c45b38..000000000 --- a/configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a +++ /dev/null @@ -1 +0,0 @@ -GNU_BIN = /opt/RHEL7/bin diff --git a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common index 896aa1645..0c07a84e7 100644 --- a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common @@ -3,8 +3,3 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common # Improved error checking with clang CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang - -# NI Linux Real-Time 7.x -# requires RPM gcc-c++-arm-linux-gnu -# Not available on RHEL8 -CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a diff --git a/configure/os/CONFIG_SITE.RHEL8-x86_64.Common b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common index 96b5560e1..f085678b5 100644 --- a/configure/os/CONFIG_SITE.RHEL8-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common @@ -5,7 +5,3 @@ CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang # Build for old RHEL7 64 bit CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64 - -# NI Linux Real-Time 7.x -# requires RPM gcc-c++-arm-linux-gnu -CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a diff --git a/configure/os/CONFIG_SITE.linux-x86_64.Common b/configure/os/CONFIG_SITE.linux-x86_64.Common index f657de1f1..310b795ef 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.Common +++ b/configure/os/CONFIG_SITE.linux-x86_64.Common @@ -26,3 +26,6 @@ CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64 # Newer DeltaTau PowerPMAC #CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP + +# NI Linux Real-Time 7.x +CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a