From ff2d529eb58c8a008c64c7f0dd7870a68503f1b2 Mon Sep 17 00:00:00 2001 From: Steeve Morin Date: Wed, 5 Nov 2014 23:10:24 +0100 Subject: [PATCH] [linux] Update images to ensure proper triples Signed-off-by: Steeve Morin --- linux-x64/Dockerfile | 5 ++++- linux-x86/Dockerfile | 10 +++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/linux-x64/Dockerfile b/linux-x64/Dockerfile index 885e0bc..eb8d061 100644 --- a/linux-x64/Dockerfile +++ b/linux-x64/Dockerfile @@ -9,4 +9,7 @@ ENV LD_LIBRARY_PATH ${CROSS_ROOT}/lib:${LD_LIBRARY_PATH} RUN mkdir -p ${CROSS_ROOT} && \ cd /usr/bin && \ ln -s ${CROSS_TRIPLE}-gcc ${CROSS_TRIPLE}-cc && \ - ln -s ${CROSS_TRIPLE}-g++ ${CROSS_TRIPLE}-c++ + ln -s ${CROSS_TRIPLE}-cpp ${CROSS_TRIPLE}-c++ && \ + for i in ranlib nm ar; do \ + ln -s ${CROSS_TRIPLE}-gcc-${i}-4.7 ${CROSS_TRIPLE}-${i} ; \ + done diff --git a/linux-x86/Dockerfile b/linux-x86/Dockerfile index 5901b8b..f327460 100644 --- a/linux-x86/Dockerfile +++ b/linux-x86/Dockerfile @@ -15,13 +15,9 @@ RUN mkdir -p ${CROSS_ROOT} && \ cd /usr/bin && \ chmod +x ${CROSS_TRIPLE}.sh && \ ln -s x86_64-linux-gnu-gcc x86_64-linux-gnu-cc && \ - ln -s x86_64-linux-gnu-g++ x86_64-linux-gnu-c++ && \ - ln -s ${CROSS_TRIPLE}.sh ${CROSS_TRIPLE}-gcc-4.9 && \ - ln -s ${CROSS_TRIPLE}.sh ${CROSS_TRIPLE}-gcc && \ + ln -s x86_64-linux-gnu-cpp x86_64-linux-gnu-c++ && \ ln -s ${CROSS_TRIPLE}.sh ${CROSS_TRIPLE}-cc && \ - ln -s ${CROSS_TRIPLE}.sh ${CROSS_TRIPLE}-g++-4.9 && \ - ln -s ${CROSS_TRIPLE}.sh ${CROSS_TRIPLE}-g++ && \ ln -s ${CROSS_TRIPLE}.sh ${CROSS_TRIPLE}-c++ && \ - for i in x86_64-linux-gnu-*; do \ - ln -s $i `echo $i | sed "s/x86_64-linux-gnu-/${CROSS_TRIPLE}-/"`; \ + for i in ranlib nm ar; do \ + ln -s x86_64-linux-gnu-gcc-${i}-4.7 ${CROSS_TRIPLE}-${i} ; \ done