diff --git a/pisi/actionsapi/get.py b/pisi/actionsapi/get.py index 9960d7c8..504d8165 100644 --- a/pisi/actionsapi/get.py +++ b/pisi/actionsapi/get.py @@ -52,16 +52,16 @@ def srcDIR(): return env.src_name + '-' + env.src_version def HOST(): - return flags.host + return env.host def CFLAGS(): - return flags.cflags + return env.cflags def CXXFLAGS(): - return flags.cxxflags + return env.cxxflags def LDFLAGS(): - return flags.ldflags + return env.ldflags def getBinutilsInfo(needed): return "%s-%s" % (HOST(), needed) diff --git a/pisi/actionsapi/variables.py b/pisi/actionsapi/variables.py index dd416364..a0ea23a0 100644 --- a/pisi/actionsapi/variables.py +++ b/pisi/actionsapi/variables.py @@ -29,7 +29,11 @@ class Env(object): 'install_dir': 'INSTALL_DIR', 'src_name': 'SRC_NAME', 'src_version': 'SRC_VERSION', - 'src_release': 'SRC_RELEASE' + 'src_release': 'SRC_RELEASE', + 'host': 'HOST', + 'cflags': 'CFLAGS', + 'cxxflags': 'CXXFLAGS', + 'ldflags': 'LDFLAGS' } def __getattr__(self, attr): @@ -60,7 +64,7 @@ class Flags: environ['HOST'] = host = values.build.host environ['CFLAGS'] = cflags = values.build.cflags environ['CXXFLAGS'] = cxxflags = values.build.cxxflags - ldflags = values.build.ldflags + environ['LDFLAGS'] = ldflags = values.build.ldflags class Variables(pisi.config.Config): const = pisi.constants.const