Skip to content

Commit

Permalink
fix linux x86 build (#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
niall-robson-instil authored Dec 15, 2022
1 parent 4ae8d0e commit 0cc5fa4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion linux-dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV TZ Europe/London
RUN apt update && \
apt -y upgrade

RUN apt -y install python3-pip gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
RUN apt -y install python3-pip gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu gcc-x86-64-linux-gnu binutils-x86-64-linux-gnu

RUN pip install conan

Expand Down
2 changes: 1 addition & 1 deletion profiles/linux-armv8.profile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include(default)
os=Linux
arch=armv8
compiler=gcc
compiler.version=9.2
compiler.version=11.3
compiler.libcxx=libstdc++

[env]
Expand Down
6 changes: 5 additions & 1 deletion profiles/linux-x86.profile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,9 @@ include(default)
os=Linux
arch=x86_64
compiler=gcc
compiler.version=9.2
compiler.version=11.3
compiler.libcxx=libstdc++

[env]
CC=x86_64-linux-gnu-gcc
CXX=x86_64-linux-gnu-g++

0 comments on commit 0cc5fa4

Please # to comment.