Skip to content

Revert "Build static PIE binaries with clang" #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2024
Merged

Revert "Build static PIE binaries with clang" #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/chroot/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ find /scripts
apk update
apk add alpine-sdk util-linux strace file autoconf automake libtool xz bash \
eudev-dev gettext-dev linux-headers meson \
zstd-dev zlib-dev zlib-static clang
zstd-dev zlib-dev zlib-static # fuse3-dev fuse3-static fuse-static fuse-dev

/scripts/common/install-dependencies.sh
/scripts/build-runtime.sh
2 changes: 1 addition & 1 deletion scripts/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM ${docker_arch}/alpine:latest
RUN apk add --no-cache \
bash alpine-sdk util-linux strace file autoconf automake libtool xz \
eudev-dev gettext-dev linux-headers meson \
zstd-dev zstd-static zlib-dev zlib-static clang
zstd-dev zstd-static zlib-dev zlib-static # fuse3-dev fuse3-static fuse-static fuse-dev

COPY scripts/common/install-dependencies.sh /tmp/scripts/common/install-dependencies.sh
COPY patches/ /tmp/patches/
Expand Down
4 changes: 2 additions & 2 deletions src/runtime/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CC = clang
CFLAGS = -std=gnu99 -Os -D_FILE_OFFSET_BITS=64 -DGIT_COMMIT=\"${GIT_COMMIT}\" -T data_sections.ld -ffunction-sections -fdata-sections -Wl,--gc-sections -static -Wall -Werror -static-pie
CC = gcc
CFLAGS = -std=gnu99 -Os -D_FILE_OFFSET_BITS=64 -DGIT_COMMIT=\"${GIT_COMMIT}\" -T data_sections.ld -ffunction-sections -fdata-sections -Wl,--gc-sections -static -Wall -Werror -fPIE
LIBS = -lsquashfuse -lsquashfuse_ll -lzstd -lz -lfuse3

all: runtime
Expand Down
Loading