Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Plume arm builds #427

Merged
merged 4 commits into from Jan 18, 2019

Conversation

Projects
None yet
3 participants
@mcrosson
Copy link
Contributor

mcrosson commented Jan 12, 2019

llvm latest svn commit is broken as of 2019/01/12. This patch pins the llvm+lld versions used for arm compiles.

It also tweaks the architecture detection to be more reliable in multi-lib/multi-arch situations where the CPU is 64bit but the runtime is 32bit.

@codecov

This comment has been minimized.

Copy link

codecov bot commented Jan 12, 2019

Codecov Report

Merging #427 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #427   +/-   ##
=======================================
  Coverage   27.64%   27.64%           
=======================================
  Files          63       63           
  Lines        7336     7336           
=======================================
  Hits         2028     2028           
  Misses       5308     5308
@@ -1,8 +1,24 @@
#!/bin/bash

ARCH=`arch`
ARCH=$(python <<EOF

This comment has been minimized.

Copy link
@BaptisteGelez

BaptisteGelez Jan 12, 2019

Member

Wouldn't it be possible to do the same with Bash? And maybe you could use Python 3 if it present instead of importing from __future__.

This comment has been minimized.

Copy link
@igalic

igalic Jan 12, 2019

Member

Wouldn't it be possible to do the same with Bash?

yes. with great difficulty.

And maybe you could use Python

+1

This comment has been minimized.

Copy link
@mcrosson

mcrosson Jan 12, 2019

Author Contributor

@BaptisteGelez I was trying to do this in bash initally and... it ended up being easier to read and maintain with python.

Re python 2/3 ; the code in question will run under both. Ubuntu and Debian still have python2 as a default and the slim docker images don't include both by default. I wanted to keep the code as generic as possible so additional dependencies won't be necessary if it's used elsewhere.

@BaptisteGelez BaptisteGelez merged commit a2ddfb0 into Plume-org:master Jan 18, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.