diff options
Diffstat (limited to 'contrib/guix')
| -rwxr-xr-x | contrib/guix/libexec/build.sh | 1 | ||||
| -rw-r--r-- | contrib/guix/patches/glibc-2.24-guix-prefix.patch | 2 | ||||
| -rw-r--r-- | contrib/guix/patches/glibc-2.27-guix-prefix.patch | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 2795a90036..f39f83d443 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -196,7 +196,6 @@ make -C depends --jobs="$JOBS" HOST="$HOST" \ x86_64_linux_RANLIB=x86_64-linux-gnu-ranlib \ x86_64_linux_NM=x86_64-linux-gnu-nm \ x86_64_linux_STRIP=x86_64-linux-gnu-strip \ - qt_config_opts_x86_64_linux='-platform linux-g++ -xplatform bitcoin-linux-g++' \ FORCE_USE_SYSTEM_CLANG=1 diff --git a/contrib/guix/patches/glibc-2.24-guix-prefix.patch b/contrib/guix/patches/glibc-2.24-guix-prefix.patch index cba2f59a8d..875e8cd611 100644 --- a/contrib/guix/patches/glibc-2.24-guix-prefix.patch +++ b/contrib/guix/patches/glibc-2.24-guix-prefix.patch @@ -15,7 +15,7 @@ when we being using newer versions of glibc. CFLAGS-.oS = $(CFLAGS-.o) $(PIC-ccflag) + +# Map Guix store paths to /usr -+CFLAGS-.oS += `find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -fdebug-prefix-map={}=/usr" \;` ++CFLAGS-.oS += `find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;` + CPPFLAGS-.oS = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1 libtype.oS = lib%_nonshared.a diff --git a/contrib/guix/patches/glibc-2.27-guix-prefix.patch b/contrib/guix/patches/glibc-2.27-guix-prefix.patch index cdb3971f7a..d777af74f0 100644 --- a/contrib/guix/patches/glibc-2.27-guix-prefix.patch +++ b/contrib/guix/patches/glibc-2.27-guix-prefix.patch @@ -15,7 +15,7 @@ when we being using newer versions of glibc. CFLAGS-.o = $(filter %frame-pointer,$(+cflags)) $(pie-default) + +# Map Guix store paths to /usr -+CFLAGS-.o += `find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -fdebug-prefix-map={}=/usr" \;` ++CFLAGS-.o += `find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;` + libtype.o := lib%.a object-suffixes += .o |