Skip to content

Commit d95e56a

Browse files
heliocastronnobelis
authored andcommittedApr 10, 2025··
refactor(conan): Remove dummy profile settings
- Remove DUMMY_COMPILER_SETTINGS from plugin code as breaks any non-linux systems. Signed-off-by: Helio Chissini de Castro <helio.chissini.de.castro@cariad.technology> Signed-off-by: Nicolas Nobelis <nicolas.nobelis@bosch.com>
1 parent f044c97 commit d95e56a

File tree

3 files changed

+0
-11
lines changed

3 files changed

+0
-11
lines changed
 

‎plugins/package-managers/conan/src/main/kotlin/Conan.kt

-6
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,6 @@ class Conan(
121121
private val config: ConanConfig
122122
) : PackageManager("Conan") {
123123
companion object {
124-
internal val DUMMY_COMPILER_SETTINGS = arrayOf(
125-
"-s", "compiler=gcc",
126-
"-s", "compiler.libcxx=libstdc++",
127-
"-s", "compiler.version=11.1"
128-
)
129-
130124
internal const val SCOPE_NAME_DEPENDENCIES = "requires"
131125
internal const val SCOPE_NAME_DEV_DEPENDENCIES = "build_requires"
132126
}

‎plugins/package-managers/conan/src/main/kotlin/ConanV1Handler.kt

-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import org.ossreviewtoolkit.model.PackageReference
3030
import org.ossreviewtoolkit.model.RemoteArtifact
3131
import org.ossreviewtoolkit.model.Scope
3232
import org.ossreviewtoolkit.model.VcsInfo
33-
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.DUMMY_COMPILER_SETTINGS
3433
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEPENDENCIES
3534
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEV_DEPENDENCIES
3635
import org.ossreviewtoolkit.utils.common.Os
@@ -70,7 +69,6 @@ internal class ConanV1Handler(private val conan: Conan) : ConanVersionHandler {
7069
definitionFile.name,
7170
"--json",
7271
jsonFile.absolutePath,
73-
*DUMMY_COMPILER_SETTINGS,
7472
"--profile",
7573
"ort-default"
7674
).requireSuccess()

‎plugins/package-managers/conan/src/main/kotlin/ConanV2Handler.kt

-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import org.ossreviewtoolkit.model.PackageReference
3232
import org.ossreviewtoolkit.model.RemoteArtifact
3333
import org.ossreviewtoolkit.model.Scope
3434
import org.ossreviewtoolkit.model.VcsInfo
35-
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.DUMMY_COMPILER_SETTINGS
3635
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEPENDENCIES
3736
import org.ossreviewtoolkit.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_DEV_DEPENDENCIES
3837
import org.ossreviewtoolkit.utils.common.Os
@@ -71,7 +70,6 @@ internal class ConanV2Handler(private val conan: Conan) : ConanVersionHandler {
7170
lockfileName,
7271
"--out-file",
7372
jsonFile.absolutePath,
74-
*DUMMY_COMPILER_SETTINGS,
7573
definitionFile.name
7674
).requireSuccess()
7775
} else {
@@ -83,7 +81,6 @@ internal class ConanV2Handler(private val conan: Conan) : ConanVersionHandler {
8381
"json",
8482
"--out-file",
8583
jsonFile.absolutePath,
86-
*DUMMY_COMPILER_SETTINGS,
8784
definitionFile.name,
8885
"--profile",
8986
"ort-default"

0 commit comments

Comments
 (0)
Please sign in to comment.