From 24562a5590f120526d390cee2180208740afcf1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= Date: Fri, 23 Sep 2016 21:29:27 +0200 Subject: [PATCH] gen_cyglto_dll.sh should not depend on running build.sh first --- tools/tools.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/tools.sh b/tools/tools.sh index c9657a8..218bd04 100644 --- a/tools/tools.sh +++ b/tools/tools.sh @@ -63,14 +63,16 @@ if [[ $SCRIPT != *wrapper/build.sh ]]; then JOBS=$(tools/get_cpu_count.sh || echo 1) fi - if [ $SCRIPT != "build.sh" -a $SCRIPT != "build_clang.sh" -a \ + if [ $SCRIPT != "build.sh" -a \ + $SCRIPT != "build_clang.sh" -a \ $SCRIPT != "mount_xcode_image.sh" -a \ $SCRIPT != "gen_sdk_package_darling_dmg.sh" -a \ - $SCRIPT != "gen_sdk_package_p7zip.sh" ]; then + $SCRIPT != "gen_sdk_package_p7zip.sh" -a \ + $SCRIPT != "gen_cyglto_dll.sh" ]; then res=$(tools/osxcross_conf.sh) if [ $? -ne 0 ]; then - echo -n "you need to complete ./build.sh first, before you can start " + echo -n "you must run ./build.sh first before you can start " echo "building $DESC" exit 1 fi