aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2016-06-03 14:00:38 -0400
committerCory Fields <cory-nospam-@coryfields.com>2016-06-03 14:48:21 -0400
commit340012d9c978901d23ccedad5805c6630c49e756 (patch)
tree5f2441fa244470927af1b6d9d195b728ced5132d
parent142ffc7e6136607b9a31709f31256f360b26588b (diff)
build: add temporary fix for "bad magic number" error in out-of-tree builds
This was caused by an pyc files hanging around from previous python2 invocations, when the matching .py missing from that path. This should not be a problem with python3's tagged caches.
-rw-r--r--Makefile.am3
-rw-r--r--src/Makefile.test.include3
2 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index b93748e324..b10d085066 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -224,6 +224,9 @@ EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/rpc-
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
+# This file is problematic for out-of-tree builds if it exists.
+DISTCLEANFILES = qa/pull-tester/tests_config.pyc
+
.INTERMEDIATE: $(COVERAGE_INFO)
clean-local:
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 77cf1001e1..ff3351fe72 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -123,6 +123,9 @@ CLEAN_BITCOIN_TEST = test/*.gcda test/*.gcno $(GENERATED_TEST_FILES)
CLEANFILES += $(CLEAN_BITCOIN_TEST)
+# This file is problematic for out-of-tree builds if it exists.
+DISTCLEANFILES += test/buildenv.pyc
+
bitcoin_test: $(TEST_BINARY)
bitcoin_test_check: $(TEST_BINARY) FORCE