Skip to content

Commit b2215b3

Browse files
committed
Merge bitcoin/bitcoin#26018: guix: consistently use -ffile-prefix-map
af2a7c8 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 af2a7c8 hebasto: ACK af2a7c8 Tree-SHA512: d34f6bc2a52811be42b911643adfefe0f232247a89dca992429a32964e1fc32225c7e996d53db4cecf455a492940d6492ad15c0e7360a98e4265b51f72a1b6d4
2 parents 37f5386 + af2a7c8 commit b2215b3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

contrib/guix/patches/glibc-2.24-guix-prefix.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ when we being using newer versions of glibc.
1515
CFLAGS-.oS = $(CFLAGS-.o) $(PIC-ccflag)
1616
+
1717
+# Map Guix store paths to /usr
18-
+CFLAGS-.oS += `find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -fdebug-prefix-map={}=/usr" \;`
18+
+CFLAGS-.oS += `find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;`
1919
+
2020
CPPFLAGS-.oS = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1
2121
libtype.oS = lib%_nonshared.a

contrib/guix/patches/glibc-2.27-guix-prefix.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ when we being using newer versions of glibc.
1515
CFLAGS-.o = $(filter %frame-pointer,$(+cflags)) $(pie-default)
1616
+
1717
+# Map Guix store paths to /usr
18-
+CFLAGS-.o += `find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -fdebug-prefix-map={}=/usr" \;`
18+
+CFLAGS-.o += `find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;`
1919
+
2020
libtype.o := lib%.a
2121
object-suffixes += .o

0 commit comments

Comments
 (0)