Skip to content

Rename object files so that we don't have collisions between different #7592

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 14, 2023
Merged

Rename object files so that we don't have collisions between different #7592

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45fbdbe
Rename object files so that we don't have collisions between different
NlightNFotis Mar 13, 2023
ed8b841
Move building of artifacts to separate subdirectory.
NlightNFotis Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions src/libcprover-cpp/add_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,44 @@ DESTINATION=$1
shift
LIB_LIST=$@

# We need to do the following renaming of object files because of translation
# unit name collisions which affect linking against the final artefact. For more
# details, please look at https://github.com/diffblue/cbmc/issues/7586 .

# Create a temporary folder for this script to work in.
rm -rf add_dependencies_tmp
mkdir add_dependencies_tmp
cd add_dependencies_tmp

# The full path of the current "root" directory
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⛏️ I found this comment confusing on first reading. Surely pwd Prints the Working Directory not the root directory which would be /? On second reading I guess this means the root of the working tree, rather than the root of the filing system, but the overloaded terminology makes this confusing.

WORKING_DIR=$(pwd)

# For each library to add:
for lib in ${LIB_LIST}; do
# We will unpack and rename all .o of dependent libraries marking them with
# their library name to avoid clashes.
LIBNAME=$(basename ${lib} .a)

# Remove previous unpacked folders and create a new fresh one to work in.
rm -rf ${LIBNAME}
mkdir ${LIBNAME}
cd ${LIBNAME}

# Unpack the library
${AR_COMMAND} -x ${lib}

# Rename all object files in the library prepending "${LIBNAME}_" to avoid
# clashes, and move to the "root" folder.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⛏️ Mixed terminology. You used "folder" here and "directory" previously. It would be nice to choose one term and use it consistently...

for obj in *.o; do
mv ${obj} "${WORKING_DIR}/${LIBNAME}_${obj}"
done

# Move back to the working directory.
cd "${WORKING_DIR}"
done

# Append all the unpacked files to the destination library
${AR_COMMAND} -rcs ${DESTINATION} *.o

# TODO: See if we need to do some cleanup in order to save cache space for
# Github actions runners.