|
1 | | -# Copyright (c) 2021 Chris Reed |
| 1 | +# Copyright (c) 2021-2022 Chris Reed |
2 | 2 | # Copyright (c) 2022 Mitchell Kline |
3 | 3 | # |
4 | 4 | # SPDX-License-Identifier: Apache-2.0 |
@@ -97,12 +97,10 @@ def run(self): |
97 | 97 | build_lib = ROOT_DIR / Path(build_py.get_package_dir(PACKAGE_NAME)).parent |
98 | 98 | else: |
99 | 99 | build_lib = Path(os.path.abspath(self.build_lib)) |
100 | | -# build_temp = Path(os.path.abspath(self.build_temp)) |
101 | 100 |
|
102 | | - # Build in-tree for the time being. libusb commit 1001cb5 adds support for out of tree builds, but |
103 | | - # this is not yet supported in an existing release. Once libusb version 1.0.25 is released, we can |
104 | | - # build out of tree. |
105 | | - build_temp = LIBUSB_DIR |
| 101 | + # Build out of tree. Requires libusb commit 1001cb5 which adds support for out of tree builds, present |
| 102 | + # in libusb 1.0.25 and later. |
| 103 | + build_temp = Path(os.path.abspath(self.build_temp)) |
106 | 104 |
|
107 | 105 | print(f"build_temp = {build_temp}") |
108 | 106 | print(f"build_lib = {build_lib}") |
@@ -156,7 +154,6 @@ def run(self): |
156 | 154 | self.spawn(['env']) # Dump environment for debugging purposes. |
157 | 155 | self.spawn(['bash', str(BOOTSTRAP_SCRIPT)]) |
158 | 156 | self.spawn(['bash', str(CONFIGURE_SCRIPT), *extra_configure_args]) |
159 | | - self.spawn(['make', 'clean']) |
160 | 157 | self.spawn(['make', f'-j{os.cpu_count() or 4}', 'all']) |
161 | 158 | except Exception as err: |
162 | 159 | # Exception is caught here and reraised as our specific Exception class because the actual |
|
0 commit comments