diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-08-29 17:19:18 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-08-29 17:19:18 -0400 |
| commit | 0481289cbccba2646bf654f0ae49ac9c45602d5d (patch) | |
| tree | cbe1351e2751e9d22c4c8add02991a3e6674f26a /gnu/build | |
| parent | c55fae452032aa4b1b63406983e9abdf70adc957 (diff) | |
| parent | 9fbf4d2a52d4d3e01059f3432bb3f78182b5a822 (diff) | |
| download | guix-patches-0481289cbccba2646bf654f0ae49ac9c45602d5d.tar guix-patches-0481289cbccba2646bf654f0ae49ac9c45602d5d.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/build')
| -rw-r--r-- | gnu/build/accounts.scm | 2 | ||||
| -rw-r--r-- | gnu/build/cross-toolchain.scm | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gnu/build/accounts.scm b/gnu/build/accounts.scm index 5094456ab1..f60d68d9b3 100644 --- a/gnu/build/accounts.scm +++ b/gnu/build/accounts.scm @@ -238,7 +238,7 @@ to it atomically and set the appropriate permissions." (for-each (lambda (entry) (display (entry->string entry) port) (newline port)) - entries)) + (delete-duplicates entries))) (if (port? file-or-port) (write-entries file-or-port) diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm index 1704157750..6bdbdd5411 100644 --- a/gnu/build/cross-toolchain.scm +++ b/gnu/build/cross-toolchain.scm @@ -128,7 +128,11 @@ C_*INCLUDE_PATH." (substitute* (string-append mingw-headers "/crt/_mingw.h") (("@MINGW_HAS_SECURE_API@") - "#define MINGW_HAS_SECURE_API 1")) + "#define MINGW_HAS_SECURE_API 1") + (("@DEFAULT_WIN32_WINNT@") + "0x502") + (("@DEFAULT_MSVCRT_VERSION@") + "0x700")) (let ((cpath (string-append mingw-headers "/include" ":" mingw-headers "/crt" |