File tree Expand file tree Collapse file tree 2 files changed +9
-8
lines changed Expand file tree Collapse file tree 2 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -14,20 +14,17 @@ for example:
14
14
./src/ci/docker/run.sh x86_64-gnu
15
15
```
16
16
17
- Images will output artifacts in an ` obj ` dir at the root of a repository. Note
17
+ Images will output artifacts in an ` obj/$image_name ` dir at the root of a repository. Note
18
18
that the script will overwrite the contents of this directory.
19
19
20
20
To match conditions in rusts CI, also set the environment variable ` DEPLOY=1 ` , e.g.:
21
21
```
22
22
DEPLOY=1 ./src/ci/docker/run.sh x86_64-gnu
23
23
```
24
24
25
- ** NOTE** : Re-using the same ` obj ` dir with different docker images with
26
- the same target triple (e.g. ` dist-x86_64-linux ` and ` dist-various-1 ` )
27
- may result in strange linker errors, due shared library versions differing between platforms.
28
-
29
- If you encounter any issues when using multiple Docker images, try deleting your ` obj ` directory
30
- before running your command.
25
+ ** NOTE** : In CI, the script outputs the artifacts to the ` obj ` directory,
26
+ while locally, to the ` obj/$image_name ` directory. This is primarily to prevent
27
+ strange linker errors when using multiple Docker images.
31
28
32
29
## Filesystem layout
33
30
Original file line number Diff line number Diff line change @@ -33,7 +33,11 @@ ci_dir="`dirname $script_dir`"
33
33
src_dir=" ` dirname $ci_dir ` "
34
34
root_dir=" ` dirname $src_dir ` "
35
35
36
- objdir=$root_dir /obj
36
+ if isCI; then
37
+ objdir=$root_dir /obj
38
+ else
39
+ objdir=$root_dir /obj/$image
40
+ fi
37
41
dist=$objdir /build/dist
38
42
39
43
You can’t perform that action at this time.
0 commit comments