Skip to content

Commit 7810099

Browse files
committed
Dereference symlinks when copying files
Invocations to `cp` now include the -L flag, for users who build CBMC out-of-tree and symlink cbmc/src/[tool-dir]/[tool] to the built binary.
1 parent ff9a66e commit 7810099

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ cbmc.zip: cbmc.inc tool-wrapper.inc $(CBMC)/LICENSE $(CBMC)/src/cbmc/cbmc $(CBMC
2222
mkdir -p $(basename $@)
2323
$(MAKE) cbmc-wrapper
2424
mv cbmc-wrapper $(basename $@)/cbmc
25-
cp $(CBMC)/LICENSE $(basename $@)/
26-
cp $(CBMC)/src/cbmc/cbmc $(basename $@)/cbmc-binary
27-
cp $(CBMC)/src/goto-cc/goto-cc $(basename $@)/
25+
cp -L $(CBMC)/LICENSE $(basename $@)/
26+
cp -L $(CBMC)/src/cbmc/cbmc $(basename $@)/cbmc-binary
27+
cp -L $(CBMC)/src/goto-cc/goto-cc $(basename $@)/
2828
chmod a+rX $(basename $@)/*
2929
zip -r $@ $(basename $@)
3030
cd $(basename $@) && rm cbmc cbmc-binary goto-cc LICENSE
@@ -34,9 +34,9 @@ cbmc.zip: cbmc.inc tool-wrapper.inc $(CBMC)/LICENSE $(CBMC)/src/cbmc/cbmc $(CBMC
3434
mkdir -p $(basename $@)
3535
$(MAKE) 2ls-wrapper
3636
mv 2ls-wrapper $(basename $@)/2ls
37-
cp $(2LS)/LICENSE $(basename $@)/
38-
cp $(2LS)/src/2ls/2ls $(basename $@)/2ls-binary
39-
cp $(2LS)/cbmc/src/goto-cc/goto-cc $(basename $@)/
37+
cp -L $(2LS)/LICENSE $(basename $@)/
38+
cp -L $(2LS)/src/2ls/2ls $(basename $@)/2ls-binary
39+
cp -L $(2LS)/cbmc/src/goto-cc/goto-cc $(basename $@)/
4040
chmod a+rX $(basename $@)/*
4141
zip -r $@ $(basename $@)
4242
cd $(basename $@) && rm 2ls 2ls-binary goto-cc LICENSE
@@ -46,9 +46,9 @@ jbmc.zip: jbmc.inc tool-wrapper.inc $(JBMC)/LICENSE $(JBMC)/jbmc/src/jbmc/jbmc $
4646
mkdir -p $(basename $@)
4747
$(MAKE) jbmc-wrapper
4848
mv jbmc-wrapper $(basename $@)/jbmc
49-
cp $(JBMC)/LICENSE $(basename $@)/
50-
cp $(JBMC)/jbmc/src/jbmc/jbmc $(basename $@)/jbmc-binary
51-
cp $(JBMC)/jbmc/lib/java-models-library/target/core-models.jar $(basename $@)/
49+
cp -L $(JBMC)/LICENSE $(basename $@)/
50+
cp -L $(JBMC)/jbmc/src/jbmc/jbmc $(basename $@)/jbmc-binary
51+
cp -L $(JBMC)/jbmc/lib/java-models-library/target/core-models.jar $(basename $@)/
5252
chmod a+rX $(basename $@)/*
5353
zip -r $@ $(basename $@)
5454
cd $(basename $@) && rm jbmc jbmc-binary core-models.jar LICENSE

0 commit comments

Comments
 (0)