sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#26018: consistently use -ffile-prefix-map

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2023-05-09 18:08:03 +00:00 committed by PastaPastaPasta
parent a8129266eb
commit 9c5d657c54
2 changed files with 2 additions and 2 deletions
Show Stats 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