tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-03 02:27:48 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

Makefile: avoid libtinfo and libz dependency of LLVM

Browse Source 
These two dependencies are optional but enabled by default when
available. Disable them in the Makefile so that the tinygo binary is
portable to systems that don't have them or have a different version
(for example, Arch has a newer version of libcurses and thus libtinfo).
This commit is contained in:
Ayke van Laethem
2019-05-07 22:14:14 +02:00
committed by Ron Evans
parent 4ae4ef5e12
commit eb0ce8a298
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.circleci/config.yml
+4 -5
View File
@@ -118,7 +118,6 @@ commands:
name: "Install apt dependencies"
command: |
sudo apt-get install \
libtinfo-dev \
python3 \
gcc-arm-linux-gnueabihf \
binutils-arm-none-eabi \
@@ -137,7 +136,7 @@ commands:
- llvm-source-linux
- restore_cache:
keys:
- llvm-build-8-v2
- llvm-build-8-linux-v4
- run:
name: "Build LLVM"
command: |
@@ -155,7 +154,7 @@ commands:
make llvm-build
fi
- save_cache:
key: llvm-build-8-v2
key: llvm-build-8-linux-v4
paths:
llvm-build
- run:
@@ -208,7 +207,7 @@ commands:
- llvm
- restore_cache:
keys:
- llvm-build-8-macos-v2
- llvm-build-8-macos-v3
- run:
name: "Build LLVM"
command: |
@@ -220,7 +219,7 @@ commands:
make llvm-build
fi
- save_cache:
key: llvm-build-8-macos-v2
key: llvm-build-8-macos-v3
paths:
llvm-build
- run:
Makefile
+1 -1
View File
@@ -69,7 +69,7 @@ llvm-source: llvm/README.txt llvm/tools/clang/README.txt llvm/tools/lld/README.m
# Configure LLVM.
llvm-build/build.ninja: llvm-source
mkdir -p llvm-build; cd llvm-build; cmake -G Ninja ../llvm "-DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64;WebAssembly" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR" -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=OFF -DLIBCLANG_BUILD_STATIC=ON
mkdir -p llvm-build; cd llvm-build; cmake -G Ninja ../llvm "-DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64;WebAssembly" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR" -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=OFF -DLIBCLANG_BUILD_STATIC=ON -DLLVM_ENABLE_TERMINFO=OFF -DLLVM_ENABLE_ZLIB=OFF
# Build LLVM.
llvm-build: llvm-build/build.ninja