Skip to content

Commit 7ba41c8

Browse files
committed
guix: fix mingw build
1 parent d7ed379 commit 7ba41c8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

contrib/guix/patches/winpthreads-remap-guix-store.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ the package, map all guix store prefixes to something fixed, e.g. /usr.
66

77
--- a/mingw-w64-libraries/winpthreads/Makefile.in
88
+++ b/mingw-w64-libraries/winpthreads/Makefile.in
9-
@@ -478,7 +478,7 @@ top_build_prefix = @top_build_prefix@
9+
@@ -465,7 +465,7 @@ top_build_prefix = @top_build_prefix@
1010
top_builddir = @top_builddir@
1111
top_srcdir = @top_srcdir@
1212
SUBDIRS = . tests
13-
-AM_CFLAGS = -Wall -DWIN32_LEAN_AND_MEAN $(am__append_1)
14-
+AM_CFLAGS = -Wall -DWIN32_LEAN_AND_MEAN $(am__append_1) $(shell find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
13+
-AM_CFLAGS = $(am__append_1) $(am__append_3)
14+
+AM_CFLAGS = $(am__append_1) $(am__append_3) $(shell find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
1515
ACLOCAL_AMFLAGS = -I m4
1616
lib_LTLIBRARIES = libwinpthread.la
17-
include_HEADERS = include/pthread.h include/sched.h include/semaphore.h include/pthread_unistd.h include/pthread_time.h include/pthread_compat.h include/pthread_signal.h
17+
include_HEADERS = \

0 commit comments

Comments
 (0)