Skip to content

Commit f68a35b

Browse files
authored
Merge pull request #686 from glu-lang/fix/dockerfile-stdlib
build: fix dockerfile to support stdlib and glu-demangle tool
2 parents 18292b5 + fdbe43e commit f68a35b

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ RUN apt-get update && apt-get install -y \
2424
llvm-18-tools \
2525
lld-18 \
2626
libclang-18-dev \
27+
cargo \
2728
&& rm -rf /var/lib/apt/lists/*
2829

2930
# Install modern CMake from Kitware repository
@@ -55,7 +56,7 @@ RUN cmake -Bbuild \
5556
-DCMAKE_CXX_COMPILER=clang++
5657

5758
# Build the project
58-
RUN cmake --build build -j$(nproc) --target gluc unit_tests
59+
RUN cmake --build build -j$(nproc)
5960

6061
# Stage 2: Minimal runtime image
6162
FROM ubuntu:22.04
@@ -90,10 +91,11 @@ WORKDIR /app
9091

9192
# Copy compiled binaries from builder stage
9293
COPY --from=builder /app/build/tools/gluc/gluc /usr/local/bin/
94+
COPY --from=builder /app/build/tools/glu-demangle/glu-demangle /usr/local/bin/
9395
COPY --from=builder /app/build/test/unit_tests /app/
9496
# Copy shared libraries directly to /usr/local/lib
9597
COPY --from=builder /app/build/lib/*/*.so /usr/local/lib/
96-
COPY --from=builder /app/stdlib/ /app/stdlib/
98+
COPY --from=builder /app/build/tools/lib/ /usr/local/lib/
9799
COPY --from=builder /app/test/functional/ /app/test/functional/
98100

99101
# Update dynamic library cache

0 commit comments

Comments
 (0)