diff options
| author | fanquake <fanquake@gmail.com> | 2022-09-08 16:00:55 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-09-08 16:01:10 +0100 |
| commit | b2215b316de70dd40a29fb3731ad8437c6a12673 (patch) | |
| tree | cc190f9031fde7fc9c3c6d275d87bde9a70f8cd9 | |
| parent | 37f53863499ac0e14b4dbfc6e696b9bd6d93b708 (diff) | |
| parent | af2a7c89430856c326e971018c1e1e0813739339 (diff) | |
| download | bitcoin-b2215b316de70dd40a29fb3731ad8437c6a12673.tar.xz | |
Merge bitcoin/bitcoin#26018: guix: consistently use -ffile-prefix-map
af2a7c89430856c326e971018c1e1e0813739339 guix: consistently use -ffile-prefix-map (fanquake)
Pull request description:
Aside from being the [newer, more comprehensive option](https://reproducible-builds.org/docs/build-path/), it's what we
claim to use in the patch docs, and everywhere else in guix.
ACKs for top commit:
achow101:
ACK af2a7c89430856c326e971018c1e1e0813739339
hebasto:
ACK af2a7c89430856c326e971018c1e1e0813739339
Tree-SHA512: d34f6bc2a52811be42b911643adfefe0f232247a89dca992429a32964e1fc32225c7e996d53db4cecf455a492940d6492ad15c0e7360a98e4265b51f72a1b6d4
| -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 |
2 files changed, 2 insertions, 2 deletions
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 |