From bc261e50c9ee43adcfd1af68606b32b9462a1d2a Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sat, 24 Aug 2019 08:01:43 -0700 Subject: [PATCH] Linux fixes --- .gitignore | 7 ++++--- bin/build.sh | 17 +++++++++++++++++ extern/llvm_build.sh | 0 3 files changed, 21 insertions(+), 3 deletions(-) mode change 100644 => 100755 extern/llvm_build.sh diff --git a/.gitignore b/.gitignore index f4a88ac9..cd00f739 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,16 @@ +*.lst +*.vcxproj.user */llvm-* */llvm_* */x64/* **/Debug*/* **/Release*/* -**/Build/* +**/build/* **/.vs/* lld-link.exe stats/ IDE/dist/* dist/* -*.lst -*.vcxproj.user +BeefySysLib/third_party/* BeefTools/RandoCode/* jbuild*/ \ No newline at end of file diff --git a/bin/build.sh b/bin/build.sh index 39ea618c..408b7da5 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -7,6 +7,23 @@ cd "$(dirname "$0")" # exit when any command fails set -e +### Dependencies ### + +if [ ! -f ../BeefySysLib/third_party/libffi/Makefile ]; then + echo Building libffi... + cd ../BeefySysLib/third_party/libffi + ./configure + make + cd "$(dirname "$0")" +fi + +if [ ! -d ../extern/llvm_linux_8_0_0 ]; then + echo Building LLVM... + cd ../extern + ./llvm_build.sh + cd "$(dirname "$0")" +fi + ### LIBS ### cd .. diff --git a/extern/llvm_build.sh b/extern/llvm_build.sh old mode 100644 new mode 100755