diff options
Diffstat (limited to 'morphlib/builder.py')
| -rw-r--r-- | morphlib/builder.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/morphlib/builder.py b/morphlib/builder.py index c3e71c09..05298994 100644 --- a/morphlib/builder.py +++ b/morphlib/builder.py @@ -250,7 +250,7 @@ class ChunkBuilder(BlobBuilder): # pragma: no cover 'configure-commands': [ 'if [ -e autogen.sh ]; then ./autogen.sh; ' + 'elif [ ! -e ./configure ]; then autoreconf -ivf; fi', - './configure --prefix=/usr', + './configure --prefix="$PREFIX"', ], 'build-commands': [ 'make', @@ -561,6 +561,11 @@ class Builder(object): # pragma: no cover self.source_manager = source_manager self.factory = factory self.indent = 0 + # create build environment string in advance + env_names = ("USER", "USERNAME", "LOGNAME", + "TOOLCHAIN_TARGET", "PREFIX", "BOOTSTRAP") + env = app.clean_env() + self.build_env = ''.join(k + env[k] for k in env_names) def msg(self, text): spaces = ' ' * self.indent @@ -726,6 +731,7 @@ class Builder(object): # pragma: no cover 'arch': morphlib.util.arch(), 'ref': blob.morph.treeish.sha1, 'kids': ''.join(self.cachedir.key(k) for k in kids), + 'env': self.build_env, } return dict_key |