Skip to content

Commit 76b591b

Browse files
heliocastronnobelis
authored andcommitted
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 <[email protected]> Signed-off-by: Nicolas Nobelis <[email protected]>
1 parent 6f90359 commit 76b591b

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,6 @@ class Conan(
122122
private val config: ConanConfig
123123
) : PackageManager("Conan") {
124124
companion object {
125-
internal val DUMMY_COMPILER_SETTINGS = arrayOf(
126-
"-s", "compiler=gcc",
127-
"-s", "compiler.libcxx=libstdc++",
128-
"-s", "compiler.version=11.1"
129-
)
130-
131125
internal const val SCOPE_NAME_DEPENDENCIES = "requires"
132126
internal const val SCOPE_NAME_DEV_DEPENDENCIES = "build_requires"
133127
internal const val SCOPE_NAME_TEST_DEPENDENCIES = "test_requires"

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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 3 deletions
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.plugins.packagemanagers.conan.Conan.Companion.SCOPE_NAME_TEST_DEPENDENCIES
@@ -74,7 +73,6 @@ internal class ConanV2Handler(private val conan: Conan) : ConanVersionHandler {
7473
jsonFile.absolutePath,
7574
"--profile:all",
7675
"ort-default",
77-
*DUMMY_COMPILER_SETTINGS,
7876
definitionFile.name
7977
).requireSuccess()
8078
} else {
@@ -88,7 +86,6 @@ internal class ConanV2Handler(private val conan: Conan) : ConanVersionHandler {
8886
jsonFile.absolutePath,
8987
"--profile:all",
9088
"ort-default",
91-
*DUMMY_COMPILER_SETTINGS,
9289
definitionFile.name
9390
).requireSuccess()
9491
}

0 commit comments

Comments
 (0)