Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Look in both lib and lib64 for CMake modules when building EOSIO Tester #7323

Merged
merged 1 commit into from
May 13, 2019

Conversation

kj4ezj
Copy link
Contributor

@kj4ezj kj4ezj commented May 10, 2019

Change Description

Currently, the CDT pipeline fails to build CDT in the presence of EOSIO on CentOS with integration tests because it can't find libbuiltins. Previously, in pull request 7140, I had configured CMake to be able to find libraries in $HOME/opt/eosio/lib64/ on CentOS. Unfortunately, CMake is still putting the libbuiltins.a file in $HOME/opt/eosio/lib/ during the EOSIO build, even though all other libraries are being put into $HOME/opt/eosio/lib64/.

This pull request addresses this unexpected and undesirable behavior by configuring CMake to check both places for each individual file while building EOSIO tester, instead of expecting all files to be in one folder or the other.

Tested

See Also

Consensus Changes

  • Consensus Changes
    None.

API Changes

  • API Changes
    None.

Documentation Additions

  • Documentation Additions
    None.

@kj4ezj kj4ezj requested review from larryk85 and arhag May 10, 2019 21:10
@kj4ezj kj4ezj changed the title Tell CMake to look in both lib and lib64 for libbuiltins CMake looks in both lib and lib64 for CMake modules when building EOSIO Tester May 10, 2019
@kj4ezj kj4ezj changed the title CMake looks in both lib and lib64 for CMake modules when building EOSIO Tester Look in both lib and lib64 for CMake modules when building EOSIO Tester May 10, 2019
@kj4ezj kj4ezj merged commit 5a722eb into release/1.7.x May 13, 2019
@kj4ezj kj4ezj deleted the zach-cdt-fixes branch May 13, 2019 14:29
@kj4ezj
Copy link
Contributor Author

kj4ezj commented May 13, 2019

The sync tests are sick today, ignore that check.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants