Skip to content

Commit

Permalink
coin: Move cross-compilation build directories outside of sources
Browse files Browse the repository at this point in the history
This stops confusing the 'reuse' tool when trying to generate a source
SBOM. The tool considers all files in the source dir as source files,
and because we placed the build dir inside the source dir, all build
files were considered source files. This caused errors saying the
files don't have copyright headers.

Change the build directory for cross-compilation jobs to be outside of
the source directory, similar how we do it for the native builds.

Augments ae62d90

Task-number: QTBUG-82820
Task-number: QTBUG-96513
Task-number: QTBUG-122899
Task-number: QTBUG-124453
Task-number: QTBUG-125211
Change-Id: Ie82a6c55aa5326f7e9cc5c0e09342f3405e78d17
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit fc08a07)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
  • Loading branch information
alcroito authored and Qt Cherry-pick Bot committed Oct 8, 2024
1 parent be2e37f commit 3946e7a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ instructions:
- type: MakeDirectory
directory: .git
- type: MakeDirectory
directory: build
directory: "{{.SourceDir}}_build"
- type: ChangeDirectory
directory: "{{.BuildDir}}/build"
directory: "{{.SourceDir}}_build"
- type: MakeDirectory
directory: target
- type: EnvironmentVariable
variableName: DESTDIR
variableValue: ""
- type: SetBuildDirectory
directory: "{{.SourceDir}}/build/target"
directory: "{{.SourceDir}}_build/target"
- type: ChangeDirectory
directory: "{{.BuildDir}}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ instructions:
- type: MakeDirectory
directory: .git
- type: MakeDirectory
directory: build
directory: "{{.SourceDir}}_build"
- type: ChangeDirectory
directory: "{{.BuildDir}}/build"
directory: "{{.SourceDir}}_build"
- type: MakeDirectory
directory: target
- type: EnvironmentVariable
variableName: DESTDIR
variableValue: ""
- type: SetBuildDirectory
directory: "{{.SourceDir}}/build/target"
directory: "{{.SourceDir}}_build/target"
- type: ChangeDirectory
directory: "{{.BuildDir}}"

Expand Down

0 comments on commit 3946e7a

Please sign in to comment.