diff options
author | Alexis Christoforides <alexis@thenull.net> | 2019-06-17 18:54:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-17 18:54:25 +0300 |
commit | e623c98cd8d5b8195a995c646776777f91e97c81 (patch) | |
tree | b2a4ceaeb3cdb7f09d9a85feeda99f62581a8f78 | |
parent | ea42169ff7faf669b57241b43f3cedcb42e2f7c1 (diff) | |
parent | f04877cd480f25c7fe22268e03bb6fac5d6028c8 (diff) |
Merge pull request #98 from mono/mono-gh-13804-speculative-fix
Another speculative fix for 'pkg-config' sometimes getting built as a…
-rwxr-xr-x | bockbuild.py | 4 | ||||
-rw-r--r-- | bockbuild/darwinprofile.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bockbuild.py b/bockbuild.py index a3b0cfe..691060b 100755 --- a/bockbuild.py +++ b/bockbuild.py @@ -194,8 +194,6 @@ class Bockbuild: self.artifact_root, '%s-%s' % (package.name, arch)) package.buildstring_file = package.build_artifact + '.buildstring' package.log = os.path.join(self.logs, package.name + '.log') - if os.path.exists(package.log): - delete(package.log) package.source_dir_name = expand_macros(package.source_dir_name, package) workspace_path = os.path.join(self.build_root, package.source_dir_name) @@ -226,6 +224,8 @@ class Bockbuild: package.deploy_requests.append (stage) for package in packages.values(): + if os.path.exists(package.log): + delete(package.log) package.start_build(arch, dest, stage) # make artifact in scratch # delete artifact + buildstring diff --git a/bockbuild/darwinprofile.py b/bockbuild/darwinprofile.py index 716b227..6f15680 100644 --- a/bockbuild/darwinprofile.py +++ b/bockbuild/darwinprofile.py @@ -139,12 +139,12 @@ class DarwinProfile (UnixProfile): package.local_ld_flags = ['-arch i386', '-m32'] package.local_gcc_flags = ['-arch i386', '-m32'] package.local_configure_flags = [ - '--build=i386-apple-darwin13.0.0', '--disable-dependency-tracking'] + '--build=i386-apple-darwin13.0.0', '--host=i386-apple-darwin13.0.0', '--disable-dependency-tracking'] elif arch == 'darwin-64': package.local_ld_flags = ['-arch x86_64 -m64'] package.local_gcc_flags = ['-arch x86_64 -m64'] package.local_configure_flags = [ - '--build=x86_64-apple-darwin13.0.0', '--disable-dependency-tracking'] + '--build=x86_64-apple-darwin13.0.0', '--host=x86_64-apple-darwin13.0.0', '--disable-dependency-tracking'] else: error('Unknown arch %s' % arch) |