diff --git a/aedi/target/library_tier1.py b/aedi/target/library_tier1.py index 96b237fa..517d76f7 100644 --- a/aedi/target/library_tier1.py +++ b/aedi/target/library_tier1.py @@ -21,8 +21,8 @@ import shutil import subprocess from pathlib import Path -from . import base from ..state import BuildState +from . import base class Bzip2Target(base.MakeTarget): @@ -149,9 +149,7 @@ class GlibTarget(base.MesonTarget): return state.has_source_file('glib.doap') def configure(self, state: BuildState): - environment = state.environment - environment['LDFLAGS'] += ' -framework CoreFoundation -framework Foundation' - + state.environment['LDFLAGS'] = '-framework CoreFoundation -framework Foundation' super().configure(state) def post_build(self, state: BuildState): diff --git a/aedi/target/library_tier2.py b/aedi/target/library_tier2.py index 80be9f4f..3204da2c 100644 --- a/aedi/target/library_tier2.py +++ b/aedi/target/library_tier2.py @@ -20,8 +20,8 @@ import os import shutil from pathlib import Path -from . import base from ..state import BuildState +from . import base class DumbTarget(base.CMakeStaticDependencyTarget): diff --git a/aedi/target/library_tier3.py b/aedi/target/library_tier3.py index e9c59bd7..31d7d63e 100644 --- a/aedi/target/library_tier3.py +++ b/aedi/target/library_tier3.py @@ -21,8 +21,8 @@ import os import shutil from pathlib import Path -from . import base from ..state import BuildState +from . import base class BrotliTarget(base.CMakeStaticDependencyTarget): diff --git a/aedi/target/main.py b/aedi/target/main.py index a9887cdd..93cf93be 100644 --- a/aedi/target/main.py +++ b/aedi/target/main.py @@ -21,8 +21,8 @@ import shutil from pathlib import Path from platform import machine -from . import base from ..state import BuildState +from . import base class MakeMainTarget(base.MakeTarget): diff --git a/aedi/target/special.py b/aedi/target/special.py index 233a56e9..a506e767 100644 --- a/aedi/target/special.py +++ b/aedi/target/special.py @@ -20,8 +20,8 @@ import shlex import shutil import subprocess -from . import base from ..state import BuildState +from . import base class BuildPrefix(base.Target): diff --git a/aedi/target/tool_tier1.py b/aedi/target/tool_tier1.py index 27cc43d2..349d6e0d 100644 --- a/aedi/target/tool_tier1.py +++ b/aedi/target/tool_tier1.py @@ -22,8 +22,8 @@ import platform import subprocess import zipapp -from . import base from ..state import BuildState +from . import base class CMakeTarget(base.CMakeTarget): diff --git a/aedi/target/tool_tier2.py b/aedi/target/tool_tier2.py index b4a3e13f..b9581239 100644 --- a/aedi/target/tool_tier2.py +++ b/aedi/target/tool_tier2.py @@ -18,8 +18,8 @@ import subprocess -from . import base from ..state import BuildState +from . import base class GlslangTarget(base.CMakeStaticDependencyTarget):