mirror of
https://github.com/VSCodium/vscodium
synced 2024-11-05 05:38:16 +00:00
Fix linux 32 bit builds (#85)
* Correct Linux 32-bit dependency installation
This commit is contained in:
parent
4cf7166a48
commit
c38cc161c0
2 changed files with 16 additions and 4 deletions
|
@ -16,7 +16,7 @@ node_js: "8"
|
|||
before_install:
|
||||
- curl -o- -L https://yarnpkg.com/install.sh | bash
|
||||
- export PATH="$HOME/.yarn/bin:$PATH"
|
||||
- ./install_deps.sh
|
||||
- . install_deps.sh
|
||||
- . get_repo.sh
|
||||
- . check_tags.sh
|
||||
|
||||
|
|
|
@ -5,16 +5,28 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
|||
brew install jq zip
|
||||
else
|
||||
sudo apt-get update
|
||||
sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev fakeroot rpm jq
|
||||
sudo apt-get install -y fakeroot rpm jq
|
||||
if [[ "$BUILDARCH" == "ia32" ]]; then
|
||||
sudo dpkg --add-architecture i386
|
||||
sudo apt-get update
|
||||
sudo apt-get install libc6-dev-i386 gcc-multilib g++-multilib
|
||||
sudo apt-get install libx11-dev:i386 libxkbfile-dev:i386
|
||||
sudo apt-get install -y gcc-multilib g++-multilib
|
||||
sudo apt-get install -y \
|
||||
libgirepository-1.0-1:i386 \
|
||||
gir1.2-glib-2.0:i386 \
|
||||
libglib2.0-dev:i386 \
|
||||
gir1.2-secret-1:i386 \
|
||||
libx11-dev:i386 \
|
||||
libxkbfile-dev:i386 \
|
||||
libsecret-1-dev:i386
|
||||
export CFLAGS=-m32
|
||||
export CXXFLAGS=-m32
|
||||
export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
|
||||
elif [[ $BUILDARCH == "arm64" ]]; then
|
||||
# Use the default C / C++ compilers,
|
||||
# because some makefiles default to CC:=gcc:
|
||||
export CC=/usr/bin/cc
|
||||
export CXX=/usr/bin/c++
|
||||
else
|
||||
sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev fakeroot rpm jq
|
||||
fi
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue