From 5c5c0df8fcf22cf1be6e0a0a3552827c7efe79b3 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 11 Oct 2018 22:59:08 +0000 Subject: [PATCH] fix --- .circleci/config.yml | 20 ++++---------------- runit-all.sh | 12 ++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 558aab0..e13442b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,14 +5,8 @@ jobs: machine: true steps: - checkout - - run: | - - export CC="cc -m64" - export CXX="c++ -m64" - chmod +x -v *.sh - sudo ./runit-all.sh - sudo rm -rf binutils-* build-* ${gcc_version} gcc-* newlib-* - no_output_timeout: 2h + - run: sudo ./runit-all.sh 64 + no_output_timeout: 2h - persist_to_workspace: root: /tmp/danio-gcc/64 paths: @@ -22,13 +16,8 @@ jobs: machine: true steps: - checkout - - run: | - export CC="cc -m32" - export CXX="c++ -m32" - chmod +x -v *.sh - sudo ./runit-all.sh - sudo rm -rf binutils-* build-* ${gcc_version} gcc-* newlib-* - no_output_timeout: 2h + - run: sudo ./runit-all.sh 32 + no_output_timeout: 2h - persist_to_workspace: root: /tmp/danio-gcc/32 paths: @@ -46,7 +35,6 @@ jobs: find . -name "*.log" -exec mv -fv {} out \; (cd out; ls | (echo ''; sed 's/^.*/&<\/a>/'; echo '') >index.html) surge --project ./out --domain danio-gcc.surge.sh - no_output_timeout: 2h workflows: version: 2 diff --git a/runit-all.sh b/runit-all.sh index 7f83ac7..7d1fb4e 100644 --- a/runit-all.sh +++ b/runit-all.sh @@ -11,6 +11,18 @@ for i in aarch64-${TUPLE}-linux alpha-${TUPLE}-linux arm-${TUPLE}-eabi arc-${TUP . ./.error break else + case ${1} in + 64) + export CC="cc -m64" + export CXX="c++ -m64" + chmod +x -v *.sh + sudo rm -rf binutils-* build-* ${gcc_version} gcc-* newlib-* ;; + 32) + export CC="cc -m32" + export CXX="c++ -m32" + chmod +x -v *.sh + sudo rm -rf binutils-* build-* ${gcc_version} gcc-* newlib-* + esac sudo ./danio_gcc.sh ${i} | tee out/${i}.log fi done