highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-10 05:57:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

guix: consistently use -ffile-prefix-map

Browse Source 
Aside from being the newer, more comprehensive option, it's what we
claim to use in the patch docs, and everywhere else in guix.
This commit is contained in:
fanquake
2022-09-06 09:50:48 +01:00
parent 5291933fed
commit af2a7c8943
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/guix/patches/glibc-2.24-guix-prefix.patch
View File

@@ -15,7 +15,7 @@ when we being using newer versions of glibc.
CFLAGS-.oS = $(CFLAGS-.o) $(PIC-ccflag) CFLAGS-.oS = $(CFLAGS-.o) $(PIC-ccflag)
+ +
+# Map Guix store paths to /usr +# 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 CPPFLAGS-.oS = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1
libtype.oS = lib%_nonshared.a libtype.oS = lib%_nonshared.a

2
contrib/guix/patches/glibc-2.27-guix-prefix.patch
View File

@@ -15,7 +15,7 @@ when we being using newer versions of glibc.
CFLAGS-.o = $(filter %frame-pointer,$(+cflags)) $(pie-default) CFLAGS-.o = $(filter %frame-pointer,$(+cflags)) $(pie-default)
+ +
+# Map Guix store paths to /usr +# 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 libtype.o := lib%.a
object-suffixes += .o object-suffixes += .o