diff --git a/configure/os/CONFIG.Common.eldk42-ppc4xxFP b/configure/os/CONFIG.Common.eldk42-ppc4xxFP index 5aea3600e..9d1affe11 100644 --- a/configure/os/CONFIG.Common.eldk42-ppc4xxFP +++ b/configure/os/CONFIG.Common.eldk42-ppc4xxFP @@ -14,9 +14,9 @@ GNU_DIR=$(ELDK)/usr # This cross tool chain is installed in a somehow weired way # Without the following lines it does not work on RHEL7 # but it worked on SL6 -ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2 -ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux -ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward +ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2 +ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux +ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib diff --git a/configure/os/CONFIG.Common.raspbian-arm b/configure/os/CONFIG.Common.raspbian-arm index c2f6ca3c4..3d5f31d6c 100644 --- a/configure/os/CONFIG.Common.raspbian-arm +++ b/configure/os/CONFIG.Common.raspbian-arm @@ -8,7 +8,7 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon # Using readline: # Due to missing/messed up libs in the toolchain, readline needs copies of -# libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs +# libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs # /lib/arm-linux-gnueabihf/ to the toolchain, e.g. # $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/ # and manually created links libtinfo.so.5 and libreadline.so. diff --git a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86 b/configure/os/CONFIG.RHEL7-x86_64.SL6-x86 index 5d1961814..ea85ada1e 100644 --- a/configure/os/CONFIG.RHEL7-x86_64.SL6-x86 +++ b/configure/os/CONFIG.RHEL7-x86_64.SL6-x86 @@ -12,5 +12,5 @@ CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44 CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44 TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include -TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib +TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo