Skip to content

Commit f4e59f2

Browse files
Merge pull request #2346 from craigcomstock/ent-12603-macos
Fixed build-in-container for MacOS
2 parents f602ef3 + 00c5925 commit f4e59f2

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

build-in-container-inner.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ for repo in $repos; do
3232
# Exclude acceptance test workdirs — they contain broken symlinks left
3333
# over from previous test runs and are not needed for building.
3434
# Also skip node_modules/vendor for hub builds.
35+
# Also skip compilation results *.o, *.lo, *.la as the local copy is likely a different platform/OS than inside the container
3536
if [ -d "$src" ] || [ -L "$src" ]; then
3637
echo "Syncing $repo..."
3738
sudo rsync -aL --exclude='config.cache' --exclude='workdir' \
39+
--exclude='*.o' --exclude='*.lo' --exclude='*.la' \
3840
--exclude='node_modules' --exclude='vendor' \
3941
--chown="$(id -u):$(id -g)" "$src/" "$BASEDIR/$repo/"
4042
else

0 commit comments

Comments
 (0)