File tree Expand file tree Collapse file tree 2 files changed +10
-3
lines changed Expand file tree Collapse file tree 2 files changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -118,7 +118,7 @@ ENV LIGHTNINGD_VERSION=master
118
118
119
119
RUN dpkg --add-architecture ${target_arch_dpkg}
120
120
121
- # TODO: python3-dev needs QEMU for post install scripts. find a workaround
121
+ # TODO: python3-dev needs QEMU for post install scripts. find a workaround to not use QEMU
122
122
RUN apt-get update && \
123
123
apt-get install -qq -y --no-install-recommends \
124
124
pkg-config:${target_arch_dpkg} \
@@ -139,7 +139,7 @@ ARG TARGET=${target_arch_rust}
139
139
ARG COPTFLAGS="-O2 ${COPTFLAGS}"
140
140
ARG RUST_PROFILE=release
141
141
142
- # TODO: set via env
142
+ # TODO: set all these config options via env variables (https://doc.rust-lang.org/cargo/reference/environment-variables.html)
143
143
RUN mkdir -p .cargo && tee .cargo/config.toml <<EOF
144
144
145
145
[build]
@@ -165,7 +165,6 @@ RUN git submodule update --init --recursive --jobs $(nproc) --depth 1
165
165
166
166
# TODO: Fix unaligned access on armv7
167
167
RUN ./configure --prefix=/tmp/lightning_install --enable-static --disable-compat --disable-valgrind
168
- # TODO: Fix cp stat error on amd64 x86-64
169
168
RUN uv run make install-program -j$(nproc)
170
169
171
170
RUN find /tmp/lightning_install -type f -executable -exec \
Original file line number Diff line number Diff line change @@ -345,6 +345,14 @@ endif
345
345
fi
346
346
347
347
RUST_PROFILE ?= debug
348
+
349
+ # Cargo places cross compiled packages in a different directory, using the target triple
350
+ ifeq ($(TARGET ) ,)
351
+ RUST_TARGET_DIR = target/$(RUST_PROFILE )
352
+ else
353
+ RUST_TARGET_DIR = target/$(TARGET ) /$(RUST_PROFILE )
354
+ endif
355
+
348
356
ifneq ($(RUST_PROFILE ) ,debug)
349
357
CARGO_OPTS := --profile=$(RUST_PROFILE ) --quiet
350
358
else
You can’t perform that action at this time.
0 commit comments