|
1 | | -# Copyright (c) 2021 Chris Reed |
| 1 | +# Copyright (c) 2021-2022 Chris Reed |
2 | 2 | # |
3 | 3 | # SPDX-License-Identifier: Apache-2.0 |
4 | 4 | # |
@@ -86,12 +86,10 @@ def run(self): |
86 | 86 | build_lib = ROOT_DIR / Path(build_py.get_package_dir(PACKAGE_NAME)).parent |
87 | 87 | else: |
88 | 88 | build_lib = Path(os.path.abspath(self.build_lib)) |
89 | | -# build_temp = Path(os.path.abspath(self.build_temp)) |
90 | 89 |
|
91 | | - # Build in-tree for the time being. libusb commit 1001cb5 adds support for out of tree builds, but |
92 | | - # this is not yet supported in an existing release. Once libusb version 1.0.25 is released, we can |
93 | | - # build out of tree. |
94 | | - build_temp = LIBUSB_DIR |
| 90 | + # Build out of tree. Requires libusb commit 1001cb5 which adds support for out of tree builds, present |
| 91 | + # in libusb 1.0.25 and later. |
| 92 | + build_temp = Path(os.path.abspath(self.build_temp)) |
95 | 93 |
|
96 | 94 | print(f"build_temp = {build_temp}") |
97 | 95 | print(f"build_lib = {build_lib}") |
@@ -142,7 +140,6 @@ def run(self): |
142 | 140 | self.spawn(['env']) # Dump environment for debugging purposes. |
143 | 141 | self.spawn(['bash', str(BOOTSTRAP_SCRIPT)]) |
144 | 142 | self.spawn(['bash', str(CONFIGURE_SCRIPT), *extra_configure_args]) |
145 | | - self.spawn(['make', 'clean']) |
146 | 143 | self.spawn(['make', f'-j{os.cpu_count() or 4}', 'all']) |
147 | 144 | except Exception as err: |
148 | 145 | # Exception is caught here and reraised as our specific Exception class because the actual |
|
0 commit comments