From 31c13bfd95b09eb4d0fe3863269de910b21fcaf5 Mon Sep 17 00:00:00 2001 From: probonopd Date: Thu, 5 Dec 2024 18:31:49 +0100 Subject: [PATCH] Revert "Build static PIE binaries with clang" This reverts commit c811634433b0eedceefc4ec70aec6c915c74977f. --- scripts/chroot/build.sh | 2 +- scripts/docker/Dockerfile | 2 +- src/runtime/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/chroot/build.sh b/scripts/chroot/build.sh index f779cdc..d356218 100755 --- a/scripts/chroot/build.sh +++ b/scripts/chroot/build.sh @@ -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 diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index e1f3798..f7da3ce 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -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/ diff --git a/src/runtime/Makefile b/src/runtime/Makefile index 242917f..b5be559 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -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