diff --git a/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64 b/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64 index 7f4c852cd..95ee5e5bd 100644 --- a/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64 +++ b/configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64 @@ -23,3 +23,6 @@ ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB) # Our host versions work just fine. AR = ar -rc RANLIB = ranlib + +# Allow to run cross-tests which expect different lib versions +export LD_PRELOAD=$(SYSROOT)/lib64/libreadline.so diff --git a/configure/os/CONFIG.RHEL9-x86_64.RHEL7-x86_64 b/configure/os/CONFIG.RHEL9-x86_64.RHEL7-x86_64 index 58eb39b57..3933e37fd 100644 --- a/configure/os/CONFIG.RHEL9-x86_64.RHEL7-x86_64 +++ b/configure/os/CONFIG.RHEL9-x86_64.RHEL7-x86_64 @@ -16,3 +16,6 @@ export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(TOOLSET_DIR:%=$(SYSROOT)%/usr # The linker has problems to find indirectly referenced libraries PROD_LDLIBS += $(LDLIBS) + +# Allow to run cross-tests which expect different lib versions +export LD_PRELOAD=$(SYSROOT)/lib64/libreadline.so diff --git a/configure/os/CONFIG.RHEL9-x86_64.RHEL8-x86_64 b/configure/os/CONFIG.RHEL9-x86_64.RHEL8-x86_64 index d9aebf55b..1ddec0cdd 100644 --- a/configure/os/CONFIG.RHEL9-x86_64.RHEL8-x86_64 +++ b/configure/os/CONFIG.RHEL9-x86_64.RHEL8-x86_64 @@ -20,3 +20,6 @@ CPPFLAGS += $(WRAPPER) # But but our host versions work just fine. AR = ar -rc RANLIB = ranlib + +# Allow to run cross-tests which expect different lib versions +export LD_PRELOAD=$(SYSROOT)/lib64/libreadline.so diff --git a/configure/os/CONFIG_SITE.RHEL8-x86_64.Common b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common index 244520f20..638d48b1d 100644 --- a/configure/os/CONFIG_SITE.RHEL8-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL8-x86_64.Common @@ -2,6 +2,8 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common # Improved error checking with clang CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang +CROSS_COMPILER_RUNTEST_ARCHS += RHEL8-x86_64-clang # Build for old RHEL7 64 bit #CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64 +#CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64 diff --git a/configure/os/CONFIG_SITE.RHEL9-x86_64.Common b/configure/os/CONFIG_SITE.RHEL9-x86_64.Common index 6f6ea176f..e70b16936 100644 --- a/configure/os/CONFIG_SITE.RHEL9-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL9-x86_64.Common @@ -8,6 +8,6 @@ CROSS_COMPILER_RUNTEST_ARCHS += RHEL9-x86_64-clang CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64 CROSS_COMPILER_RUNTEST_ARCHS += RHEL8-x86_64 -# Build for old RHEL7 64 bit +# Build for even older RHEL7 64 bit #CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64 -#CROSS_COMPILER_RUNTEST_TARGET_ARCHS += RHEL7-x86_64 +#CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64