mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-27 03:33:27 -03:00
guix: use GCC 10 (over GCC 8) to build releases
This currently points to the version-1.4.0 branch.
This commit is contained in:
fanquake
parent
3e5dd94c42
commit
3ccfba1c7f
7 changed files with 43 additions and 594 deletions
|
|
@ -69,15 +69,15 @@ class TestSecurityChecks(unittest.TestCase):
|
||||||
cc = determine_wellknown_cmd('CC', 'x86_64-w64-mingw32-gcc')
|
cc = determine_wellknown_cmd('CC', 'x86_64-w64-mingw32-gcc')
|
||||||
write_testcode(source)
|
write_testcode(source)
|
||||||
|
|
||||||
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--no-nxcompat','-Wl,--disable-reloc-section','-Wl,--no-dynamicbase','-Wl,--no-high-entropy-va','-no-pie','-fno-PIE']),
|
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--disable-nxcompat','-Wl,--disable-reloc-section','-Wl,--disable-dynamicbase','-Wl,--disable-high-entropy-va','-no-pie','-fno-PIE']),
|
||||||
(1, executable+': failed PIE DYNAMIC_BASE HIGH_ENTROPY_VA NX RELOC_SECTION CONTROL_FLOW'))
|
(1, executable+': failed PIE DYNAMIC_BASE HIGH_ENTROPY_VA NX RELOC_SECTION CONTROL_FLOW'))
|
||||||
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--disable-reloc-section','-Wl,--no-dynamicbase','-Wl,--no-high-entropy-va','-no-pie','-fno-PIE']),
|
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--disable-reloc-section','-Wl,--disable-dynamicbase','-Wl,--disable-high-entropy-va','-no-pie','-fno-PIE']),
|
||||||
(1, executable+': failed PIE DYNAMIC_BASE HIGH_ENTROPY_VA RELOC_SECTION CONTROL_FLOW'))
|
(1, executable+': failed PIE DYNAMIC_BASE HIGH_ENTROPY_VA RELOC_SECTION CONTROL_FLOW'))
|
||||||
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--no-dynamicbase','-Wl,--no-high-entropy-va','-no-pie','-fno-PIE']),
|
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--disable-dynamicbase','-Wl,--disable-high-entropy-va','-no-pie','-fno-PIE']),
|
||||||
(1, executable+': failed PIE DYNAMIC_BASE HIGH_ENTROPY_VA CONTROL_FLOW'))
|
(1, executable+': failed PIE DYNAMIC_BASE HIGH_ENTROPY_VA CONTROL_FLOW'))
|
||||||
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--no-dynamicbase','-Wl,--no-high-entropy-va','-pie','-fPIE']),
|
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--disable-dynamicbase','-Wl,--disable-high-entropy-va','-pie','-fPIE']),
|
||||||
(1, executable+': failed PIE DYNAMIC_BASE HIGH_ENTROPY_VA CONTROL_FLOW')) # -pie -fPIE does nothing unless --dynamicbase is also supplied
|
(1, executable+': failed PIE DYNAMIC_BASE HIGH_ENTROPY_VA CONTROL_FLOW')) # -pie -fPIE does nothing unless --dynamicbase is also supplied
|
||||||
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--dynamicbase','-Wl,--no-high-entropy-va','-pie','-fPIE']),
|
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--dynamicbase','-Wl,--disable-high-entropy-va','-pie','-fPIE']),
|
||||||
(1, executable+': failed HIGH_ENTROPY_VA CONTROL_FLOW'))
|
(1, executable+': failed HIGH_ENTROPY_VA CONTROL_FLOW'))
|
||||||
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--dynamicbase','-Wl,--high-entropy-va','-pie','-fPIE']),
|
self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--dynamicbase','-Wl,--high-entropy-va','-pie','-fPIE']),
|
||||||
(1, executable+': failed CONTROL_FLOW'))
|
(1, executable+': failed CONTROL_FLOW'))
|
||||||
|
|
|
||||||
|
|
@ -239,7 +239,7 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --f
|
||||||
time-machine() {
|
time-machine() {
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \
|
guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \
|
||||||
--commit=aa34d4d28dfe25ba47d5800d05000fb7221788c0 \
|
--commit=fa17abf1af09570708daa28dd40ffbc932ebe25c \
|
||||||
--cores="$JOBS" \
|
--cores="$JOBS" \
|
||||||
--keep-failed \
|
--keep-failed \
|
||||||
--fallback \
|
--fallback \
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ case "$HOST" in
|
||||||
# 2. kernel-header-related search paths (not applicable to mingw-w64 hosts)
|
# 2. kernel-header-related search paths (not applicable to mingw-w64 hosts)
|
||||||
export CROSS_C_INCLUDE_PATH="${CROSS_GCC_LIB}/include:${CROSS_GCC_LIB}/include-fixed:${CROSS_GLIBC}/include"
|
export CROSS_C_INCLUDE_PATH="${CROSS_GCC_LIB}/include:${CROSS_GCC_LIB}/include-fixed:${CROSS_GLIBC}/include"
|
||||||
export CROSS_CPLUS_INCLUDE_PATH="${CROSS_GCC}/include/c++:${CROSS_GCC}/include/c++/${HOST}:${CROSS_GCC}/include/c++/backward:${CROSS_C_INCLUDE_PATH}"
|
export CROSS_CPLUS_INCLUDE_PATH="${CROSS_GCC}/include/c++:${CROSS_GCC}/include/c++/${HOST}:${CROSS_GCC}/include/c++/backward:${CROSS_C_INCLUDE_PATH}"
|
||||||
export CROSS_LIBRARY_PATH="${CROSS_GCC_LIB_STORE}/lib:${CROSS_GCC}/${HOST}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib"
|
export CROSS_LIBRARY_PATH="${CROSS_GCC_LIB_STORE}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib"
|
||||||
;;
|
;;
|
||||||
*darwin*)
|
*darwin*)
|
||||||
# The CROSS toolchain for darwin uses the SDK and ignores environment variables.
|
# The CROSS toolchain for darwin uses the SDK and ignores environment variables.
|
||||||
|
|
@ -126,7 +126,7 @@ case "$HOST" in
|
||||||
|
|
||||||
export CROSS_C_INCLUDE_PATH="${CROSS_GCC_LIB}/include:${CROSS_GCC_LIB}/include-fixed:${CROSS_GLIBC}/include:${CROSS_KERNEL}/include"
|
export CROSS_C_INCLUDE_PATH="${CROSS_GCC_LIB}/include:${CROSS_GCC_LIB}/include-fixed:${CROSS_GLIBC}/include:${CROSS_KERNEL}/include"
|
||||||
export CROSS_CPLUS_INCLUDE_PATH="${CROSS_GCC}/include/c++:${CROSS_GCC}/include/c++/${HOST}:${CROSS_GCC}/include/c++/backward:${CROSS_C_INCLUDE_PATH}"
|
export CROSS_CPLUS_INCLUDE_PATH="${CROSS_GCC}/include/c++:${CROSS_GCC}/include/c++/${HOST}:${CROSS_GCC}/include/c++/backward:${CROSS_C_INCLUDE_PATH}"
|
||||||
export CROSS_LIBRARY_PATH="${CROSS_GCC_LIB_STORE}/lib:${CROSS_GCC}/${HOST}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib:${CROSS_GLIBC_STATIC}/lib"
|
export CROSS_LIBRARY_PATH="${CROSS_GCC_LIB_STORE}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib:${CROSS_GLIBC_STATIC}/lib"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
exit 1 ;;
|
exit 1 ;;
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@
|
||||||
(gnu packages gawk)
|
(gnu packages gawk)
|
||||||
(gnu packages gcc)
|
(gnu packages gcc)
|
||||||
(gnu packages gnome)
|
(gnu packages gnome)
|
||||||
(gnu packages image)
|
|
||||||
(gnu packages installers)
|
(gnu packages installers)
|
||||||
(gnu packages linux)
|
(gnu packages linux)
|
||||||
(gnu packages llvm)
|
(gnu packages llvm)
|
||||||
|
|
@ -29,7 +28,6 @@
|
||||||
(gnu packages shells)
|
(gnu packages shells)
|
||||||
(gnu packages tls)
|
(gnu packages tls)
|
||||||
(gnu packages version-control)
|
(gnu packages version-control)
|
||||||
(guix build-system font)
|
|
||||||
(guix build-system gnu)
|
(guix build-system gnu)
|
||||||
(guix build-system python)
|
(guix build-system python)
|
||||||
(guix build-system trivial)
|
(guix build-system trivial)
|
||||||
|
|
@ -79,10 +77,6 @@ http://www.linuxfromscratch.org/hlfs/view/development/chapter05/gcc-pass1.html"
|
||||||
(("-rpath=") "-rpath-link="))
|
(("-rpath=") "-rpath-link="))
|
||||||
#t))))))))
|
#t))))))))
|
||||||
|
|
||||||
(define (make-binutils-with-mingw-w64-disable-flags xbinutils)
|
|
||||||
(package-with-extra-patches xbinutils
|
|
||||||
(search-our-patches "binutils-mingw-w64-disable-flags.patch")))
|
|
||||||
|
|
||||||
(define (make-cross-toolchain target
|
(define (make-cross-toolchain target
|
||||||
base-gcc-for-libc
|
base-gcc-for-libc
|
||||||
base-kernel-headers
|
base-kernel-headers
|
||||||
|
|
@ -134,9 +128,7 @@ chain for " target " development."))
|
||||||
(home-page (package-home-page xgcc))
|
(home-page (package-home-page xgcc))
|
||||||
(license (package-license xgcc)))))
|
(license (package-license xgcc)))))
|
||||||
|
|
||||||
(define base-gcc
|
(define base-gcc gcc-10)
|
||||||
(package-with-extra-patches gcc-8
|
|
||||||
(search-our-patches "gcc-8-sort-libtool-find-output.patch")))
|
|
||||||
|
|
||||||
;; Building glibc with stack smashing protector first landed in glibc 2.25, use
|
;; Building glibc with stack smashing protector first landed in glibc 2.25, use
|
||||||
;; this function to disable for older glibcs
|
;; this function to disable for older glibcs
|
||||||
|
|
@ -171,7 +163,7 @@ desirable for building Bitcoin Core release binaries."
|
||||||
|
|
||||||
(define (make-mingw-pthreads-cross-toolchain target)
|
(define (make-mingw-pthreads-cross-toolchain target)
|
||||||
"Create a cross-compilation toolchain package for TARGET"
|
"Create a cross-compilation toolchain package for TARGET"
|
||||||
(let* ((xbinutils (make-binutils-with-mingw-w64-disable-flags (cross-binutils target)))
|
(let* ((xbinutils (cross-binutils target))
|
||||||
(pthreads-xlibc mingw-w64-x86_64-winpthreads)
|
(pthreads-xlibc mingw-w64-x86_64-winpthreads)
|
||||||
(pthreads-xgcc (make-gcc-with-pthreads
|
(pthreads-xgcc (make-gcc-with-pthreads
|
||||||
(cross-gcc target
|
(cross-gcc target
|
||||||
|
|
@ -298,7 +290,8 @@ PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.")
|
||||||
(file-name (git-file-name name commit))
|
(file-name (git-file-name name commit))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1nyvjisvyxyxnd0023xjf5846xd03lwawp5pfzr8vrky7wwm5maz"))))
|
"1nyvjisvyxyxnd0023xjf5846xd03lwawp5pfzr8vrky7wwm5maz"))
|
||||||
|
(patches (search-our-patches "elfsteem-value-error-python-39.patch"))))
|
||||||
(build-system python-build-system)
|
(build-system python-build-system)
|
||||||
;; There are no tests, but attempting to run python setup.py test leads to
|
;; There are no tests, but attempting to run python setup.py test leads to
|
||||||
;; PYTHONPATH problems, just disable the test
|
;; PYTHONPATH problems, just disable the test
|
||||||
|
|
@ -370,6 +363,8 @@ PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.")
|
||||||
(define-public python-oscryptotests
|
(define-public python-oscryptotests
|
||||||
(package (inherit python-oscrypto)
|
(package (inherit python-oscrypto)
|
||||||
(name "python-oscryptotests")
|
(name "python-oscryptotests")
|
||||||
|
(propagated-inputs
|
||||||
|
`(("python-oscrypto" ,python-oscrypto)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f
|
`(#:tests? #f
|
||||||
#:phases
|
#:phases
|
||||||
|
|
@ -557,7 +552,7 @@ inspecting signatures in Mach-O binaries.")
|
||||||
|
|
||||||
(define-public glibc-2.24
|
(define-public glibc-2.24
|
||||||
(package
|
(package
|
||||||
(inherit glibc)
|
(inherit glibc-2.31)
|
||||||
(version "2.24")
|
(version "2.24")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
|
|
@ -573,9 +568,21 @@ inspecting signatures in Mach-O binaries.")
|
||||||
"glibc-2.24-elfm-loadaddr-dynamic-rewrite.patch"
|
"glibc-2.24-elfm-loadaddr-dynamic-rewrite.patch"
|
||||||
"glibc-2.24-no-build-time-cxx-header-run.patch"))))))
|
"glibc-2.24-no-build-time-cxx-header-run.patch"))))))
|
||||||
|
|
||||||
(define glibc-2.27/bitcoin-patched
|
(define-public glibc-2.27/bitcoin-patched
|
||||||
(package-with-extra-patches glibc-2.27
|
(package
|
||||||
(search-our-patches "glibc-2.27-riscv64-Use-__has_include__-to-include-asm-syscalls.h.patch")))
|
(inherit glibc-2.31)
|
||||||
|
(version "2.27")
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://sourceware.org/git/glibc.git")
|
||||||
|
(commit "23158b08a0908f381459f273a984c6fd328363cb")))
|
||||||
|
(file-name (git-file-name "glibc" "23158b08a0908f381459f273a984c6fd328363cb"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1b2n1gxv9f4fd5yy68qjbnarhf8mf4vmlxk10i3328c1w5pmp0ca"))
|
||||||
|
(patches (search-our-patches "glibc-ldd-x86_64.patch"
|
||||||
|
"glibc-2.27-riscv64-Use-__has_include__-to-include-asm-syscalls.h.patch"))))))
|
||||||
|
|
||||||
(packages->manifest
|
(packages->manifest
|
||||||
(append
|
(append
|
||||||
|
|
|
||||||
|
|
@ -1,171 +0,0 @@
|
||||||
Description: Add disable opposites to the security-related flags
|
|
||||||
Author: Stephen Kitt <skitt@debian.org>
|
|
||||||
|
|
||||||
This patch adds "no-" variants to disable the various security flags:
|
|
||||||
"no-dynamicbase", "no-nxcompat", "no-high-entropy-va", "disable-reloc-section".
|
|
||||||
|
|
||||||
--- a/ld/emultempl/pe.em
|
|
||||||
+++ b/ld/emultempl/pe.em
|
|
||||||
@@ -259,9 +261,11 @@
|
|
||||||
(OPTION_ENABLE_LONG_SECTION_NAMES + 1)
|
|
||||||
/* DLLCharacteristics flags. */
|
|
||||||
#define OPTION_DYNAMIC_BASE (OPTION_DISABLE_LONG_SECTION_NAMES + 1)
|
|
||||||
-#define OPTION_FORCE_INTEGRITY (OPTION_DYNAMIC_BASE + 1)
|
|
||||||
+#define OPTION_NO_DYNAMIC_BASE (OPTION_DYNAMIC_BASE + 1)
|
|
||||||
+#define OPTION_FORCE_INTEGRITY (OPTION_NO_DYNAMIC_BASE + 1)
|
|
||||||
#define OPTION_NX_COMPAT (OPTION_FORCE_INTEGRITY + 1)
|
|
||||||
-#define OPTION_NO_ISOLATION (OPTION_NX_COMPAT + 1)
|
|
||||||
+#define OPTION_NO_NX_COMPAT (OPTION_NX_COMPAT + 1)
|
|
||||||
+#define OPTION_NO_ISOLATION (OPTION_NO_NX_COMPAT + 1)
|
|
||||||
#define OPTION_NO_SEH (OPTION_NO_ISOLATION + 1)
|
|
||||||
#define OPTION_NO_BIND (OPTION_NO_SEH + 1)
|
|
||||||
#define OPTION_WDM_DRIVER (OPTION_NO_BIND + 1)
|
|
||||||
@@ -271,6 +275,7 @@
|
|
||||||
#define OPTION_NO_INSERT_TIMESTAMP (OPTION_INSERT_TIMESTAMP + 1)
|
|
||||||
#define OPTION_BUILD_ID (OPTION_NO_INSERT_TIMESTAMP + 1)
|
|
||||||
#define OPTION_ENABLE_RELOC_SECTION (OPTION_BUILD_ID + 1)
|
|
||||||
+#define OPTION_DISABLE_RELOC_SECTION (OPTION_ENABLE_RELOC_SECTION + 1)
|
|
||||||
|
|
||||||
static void
|
|
||||||
gld${EMULATION_NAME}_add_options
|
|
||||||
@@ -342,8 +347,10 @@
|
|
||||||
{"enable-long-section-names", no_argument, NULL, OPTION_ENABLE_LONG_SECTION_NAMES},
|
|
||||||
{"disable-long-section-names", no_argument, NULL, OPTION_DISABLE_LONG_SECTION_NAMES},
|
|
||||||
{"dynamicbase",no_argument, NULL, OPTION_DYNAMIC_BASE},
|
|
||||||
+ {"no-dynamicbase", no_argument, NULL, OPTION_NO_DYNAMIC_BASE},
|
|
||||||
{"forceinteg", no_argument, NULL, OPTION_FORCE_INTEGRITY},
|
|
||||||
{"nxcompat", no_argument, NULL, OPTION_NX_COMPAT},
|
|
||||||
+ {"no-nxcompat", no_argument, NULL, OPTION_NO_NX_COMPAT},
|
|
||||||
{"no-isolation", no_argument, NULL, OPTION_NO_ISOLATION},
|
|
||||||
{"no-seh", no_argument, NULL, OPTION_NO_SEH},
|
|
||||||
{"no-bind", no_argument, NULL, OPTION_NO_BIND},
|
|
||||||
@@ -351,6 +358,7 @@
|
|
||||||
{"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE},
|
|
||||||
{"build-id", optional_argument, NULL, OPTION_BUILD_ID},
|
|
||||||
{"enable-reloc-section", no_argument, NULL, OPTION_ENABLE_RELOC_SECTION},
|
|
||||||
+ {"disable-reloc-section", no_argument, NULL, OPTION_DISABLE_RELOC_SECTION},
|
|
||||||
{NULL, no_argument, NULL, 0}
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -485,9 +494,12 @@
|
|
||||||
in object files\n"));
|
|
||||||
fprintf (file, _(" --dynamicbase Image base address may be relocated using\n\
|
|
||||||
address space layout randomization (ASLR)\n"));
|
|
||||||
+ fprintf (file, _(" --no-dynamicbase Image base address may not be relocated\n"));
|
|
||||||
fprintf (file, _(" --enable-reloc-section Create the base relocation table\n"));
|
|
||||||
+ fprintf (file, _(" --disable-reloc-section Disable the base relocation table\n"));
|
|
||||||
fprintf (file, _(" --forceinteg Code integrity checks are enforced\n"));
|
|
||||||
fprintf (file, _(" --nxcompat Image is compatible with data execution prevention\n"));
|
|
||||||
+ fprintf (file, _(" --no-nxcompat Image is not compatible with data execution prevention\n"));
|
|
||||||
fprintf (file, _(" --no-isolation Image understands isolation but do not isolate the image\n"));
|
|
||||||
fprintf (file, _(" --no-seh Image does not use SEH. No SE handler may\n\
|
|
||||||
be called in this image\n"));
|
|
||||||
@@ -862,12 +874,21 @@
|
|
||||||
case OPTION_ENABLE_RELOC_SECTION:
|
|
||||||
pe_dll_enable_reloc_section = 1;
|
|
||||||
break;
|
|
||||||
+ case OPTION_DISABLE_RELOC_SECTION:
|
|
||||||
+ pe_dll_enable_reloc_section = 0;
|
|
||||||
+ /* fall through */
|
|
||||||
+ case OPTION_NO_DYNAMIC_BASE:
|
|
||||||
+ pe_dll_characteristics &= ~IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE;
|
|
||||||
+ break;
|
|
||||||
case OPTION_FORCE_INTEGRITY:
|
|
||||||
pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY;
|
|
||||||
break;
|
|
||||||
case OPTION_NX_COMPAT:
|
|
||||||
pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_NX_COMPAT;
|
|
||||||
break;
|
|
||||||
+ case OPTION_NO_NX_COMPAT:
|
|
||||||
+ pe_dll_characteristics &= ~IMAGE_DLL_CHARACTERISTICS_NX_COMPAT;
|
|
||||||
+ break;
|
|
||||||
case OPTION_NO_ISOLATION:
|
|
||||||
pe_dll_characteristics |= IMAGE_DLLCHARACTERISTICS_NO_ISOLATION;
|
|
||||||
break;
|
|
||||||
--- a/ld/emultempl/pep.em
|
|
||||||
+++ b/ld/emultempl/pep.em
|
|
||||||
@@ -237,9 +240,12 @@
|
|
||||||
OPTION_ENABLE_LONG_SECTION_NAMES,
|
|
||||||
OPTION_DISABLE_LONG_SECTION_NAMES,
|
|
||||||
OPTION_HIGH_ENTROPY_VA,
|
|
||||||
+ OPTION_NO_HIGH_ENTROPY_VA,
|
|
||||||
OPTION_DYNAMIC_BASE,
|
|
||||||
+ OPTION_NO_DYNAMIC_BASE,
|
|
||||||
OPTION_FORCE_INTEGRITY,
|
|
||||||
OPTION_NX_COMPAT,
|
|
||||||
+ OPTION_NO_NX_COMPAT,
|
|
||||||
OPTION_NO_ISOLATION,
|
|
||||||
OPTION_NO_SEH,
|
|
||||||
OPTION_NO_BIND,
|
|
||||||
@@ -248,7 +254,8 @@
|
|
||||||
OPTION_NO_INSERT_TIMESTAMP,
|
|
||||||
OPTION_TERMINAL_SERVER_AWARE,
|
|
||||||
OPTION_BUILD_ID,
|
|
||||||
- OPTION_ENABLE_RELOC_SECTION
|
|
||||||
+ OPTION_ENABLE_RELOC_SECTION,
|
|
||||||
+ OPTION_DISABLE_RELOC_SECTION
|
|
||||||
};
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -315,9 +322,12 @@
|
|
||||||
{"enable-long-section-names", no_argument, NULL, OPTION_ENABLE_LONG_SECTION_NAMES},
|
|
||||||
{"disable-long-section-names", no_argument, NULL, OPTION_DISABLE_LONG_SECTION_NAMES},
|
|
||||||
{"high-entropy-va", no_argument, NULL, OPTION_HIGH_ENTROPY_VA},
|
|
||||||
+ {"no-high-entropy-va", no_argument, NULL, OPTION_NO_HIGH_ENTROPY_VA},
|
|
||||||
{"dynamicbase",no_argument, NULL, OPTION_DYNAMIC_BASE},
|
|
||||||
+ {"no-dynamicbase", no_argument, NULL, OPTION_NO_DYNAMIC_BASE},
|
|
||||||
{"forceinteg", no_argument, NULL, OPTION_FORCE_INTEGRITY},
|
|
||||||
{"nxcompat", no_argument, NULL, OPTION_NX_COMPAT},
|
|
||||||
+ {"no-nxcompat", no_argument, NULL, OPTION_NO_NX_COMPAT},
|
|
||||||
{"no-isolation", no_argument, NULL, OPTION_NO_ISOLATION},
|
|
||||||
{"no-seh", no_argument, NULL, OPTION_NO_SEH},
|
|
||||||
{"no-bind", no_argument, NULL, OPTION_NO_BIND},
|
|
||||||
@@ -327,6 +337,7 @@
|
|
||||||
{"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP},
|
|
||||||
{"build-id", optional_argument, NULL, OPTION_BUILD_ID},
|
|
||||||
{"enable-reloc-section", no_argument, NULL, OPTION_ENABLE_RELOC_SECTION},
|
|
||||||
+ {"disable-reloc-section", no_argument, NULL, OPTION_DISABLE_RELOC_SECTION},
|
|
||||||
{NULL, no_argument, NULL, 0}
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -448,11 +461,15 @@
|
|
||||||
in object files\n"));
|
|
||||||
fprintf (file, _(" --high-entropy-va Image is compatible with 64-bit address space\n\
|
|
||||||
layout randomization (ASLR)\n"));
|
|
||||||
+ fprintf (file, _(" --no-high-entropy-va Image is not compatible with 64-bit ASLR\n"));
|
|
||||||
fprintf (file, _(" --dynamicbase Image base address may be relocated using\n\
|
|
||||||
address space layout randomization (ASLR)\n"));
|
|
||||||
+ fprintf (file, _(" --no-dynamicbase Image base address may not be relocated\n"));
|
|
||||||
fprintf (file, _(" --enable-reloc-section Create the base relocation table\n"));
|
|
||||||
+ fprintf (file, _(" --disable-reloc-section Disable the base relocation table\n"));
|
|
||||||
fprintf (file, _(" --forceinteg Code integrity checks are enforced\n"));
|
|
||||||
fprintf (file, _(" --nxcompat Image is compatible with data execution prevention\n"));
|
|
||||||
+ fprintf (file, _(" --no-nxcompat Image is not compatible with data execution prevention\n"));
|
|
||||||
fprintf (file, _(" --no-isolation Image understands isolation but do not isolate the image\n"));
|
|
||||||
fprintf (file, _(" --no-seh Image does not use SEH; no SE handler may\n\
|
|
||||||
be called in this image\n"));
|
|
||||||
@@ -809,12 +826,24 @@
|
|
||||||
case OPTION_ENABLE_RELOC_SECTION:
|
|
||||||
pep_dll_enable_reloc_section = 1;
|
|
||||||
break;
|
|
||||||
+ case OPTION_DISABLE_RELOC_SECTION:
|
|
||||||
+ pep_dll_enable_reloc_section = 0;
|
|
||||||
+ /* fall through */
|
|
||||||
+ case OPTION_NO_DYNAMIC_BASE:
|
|
||||||
+ pe_dll_characteristics &= ~IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE;
|
|
||||||
+ /* fall through */
|
|
||||||
+ case OPTION_NO_HIGH_ENTROPY_VA:
|
|
||||||
+ pe_dll_characteristics &= ~IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA;
|
|
||||||
+ break;
|
|
||||||
case OPTION_FORCE_INTEGRITY:
|
|
||||||
pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY;
|
|
||||||
break;
|
|
||||||
case OPTION_NX_COMPAT:
|
|
||||||
pe_dll_characteristics |= IMAGE_DLL_CHARACTERISTICS_NX_COMPAT;
|
|
||||||
break;
|
|
||||||
+ case OPTION_NO_NX_COMPAT:
|
|
||||||
+ pe_dll_characteristics &= ~IMAGE_DLL_CHARACTERISTICS_NX_COMPAT;
|
|
||||||
+ break;
|
|
||||||
case OPTION_NO_ISOLATION:
|
|
||||||
pe_dll_characteristics |= IMAGE_DLLCHARACTERISTICS_NO_ISOLATION;
|
|
||||||
break;
|
|
||||||
13
contrib/guix/patches/elfsteem-value-error-python-39.patch
Normal file
13
contrib/guix/patches/elfsteem-value-error-python-39.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/examples/otool.py b/examples/otool.py
|
||||||
|
index 2b8efc0..d797b2e 100755
|
||||||
|
--- a/examples/otool.py
|
||||||
|
+++ b/examples/otool.py
|
||||||
|
@@ -342,7 +342,7 @@ if __name__ == '__main__':
|
||||||
|
try:
|
||||||
|
e = macho_init.MACHO(raw,
|
||||||
|
parseSymbols = False)
|
||||||
|
- except ValueError, err:
|
||||||
|
+ except ValueError as err:
|
||||||
|
print("%s:" %file)
|
||||||
|
print(" %s" % err)
|
||||||
|
continue
|
||||||
|
|
@ -1,400 +0,0 @@
|
||||||
guix: repro: Sort find output in libtool for gcc-8
|
|
||||||
|
|
||||||
Otherwise the resulting .a static libraries (e.g. libstdc++.a) will not
|
|
||||||
be reproducible and end up making the Bitcoin binaries non-reproducible
|
|
||||||
as well.
|
|
||||||
|
|
||||||
See: https://reproducible-builds.org/docs/archives/#gnu-libtool
|
|
||||||
|
|
||||||
diff --git a/gcc/configure b/gcc/configure
|
|
||||||
index 97ba7d7d69c..e37a96f0c0c 100755
|
|
||||||
--- a/gcc/configure
|
|
||||||
+++ b/gcc/configure
|
|
||||||
@@ -19720,20 +19720,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
prelink_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
||||||
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
||||||
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
||||||
old_archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
||||||
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
||||||
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
||||||
$RANLIB $oldlib'
|
|
||||||
archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
archive_expsym_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
;;
|
|
||||||
*) # Version 6 and above use weak symbols
|
|
||||||
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
diff --git a/libcc1/configure b/libcc1/configure
|
|
||||||
index f53a121611c..5740ca90cab 100755
|
|
||||||
--- a/libcc1/configure
|
|
||||||
+++ b/libcc1/configure
|
|
||||||
@@ -12221,20 +12221,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
prelink_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
||||||
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
||||||
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
||||||
old_archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
||||||
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
||||||
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
||||||
$RANLIB $oldlib'
|
|
||||||
archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
archive_expsym_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
;;
|
|
||||||
*) # Version 6 and above use weak symbols
|
|
||||||
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
diff --git a/libffi/configure b/libffi/configure
|
|
||||||
index 790a291011f..54b1ac18306 100755
|
|
||||||
--- a/libffi/configure
|
|
||||||
+++ b/libffi/configure
|
|
||||||
@@ -12661,20 +12661,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
prelink_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
||||||
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
||||||
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
||||||
old_archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
||||||
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
||||||
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
||||||
$RANLIB $oldlib'
|
|
||||||
archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
archive_expsym_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
;;
|
|
||||||
*) # Version 6 and above use weak symbols
|
|
||||||
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
diff --git a/libgo/config/libtool.m4 b/libgo/config/libtool.m4
|
|
||||||
index f7005947454..8a84417b828 100644
|
|
||||||
--- a/libgo/config/libtool.m4
|
|
||||||
+++ b/libgo/config/libtool.m4
|
|
||||||
@@ -6010,20 +6010,20 @@ if test "$_lt_caught_CXX_error" != yes; then
|
|
||||||
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
||||||
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
||||||
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
||||||
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
||||||
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
||||||
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
||||||
$RANLIB $oldlib'
|
|
||||||
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
;;
|
|
||||||
*) # Version 6 and above use weak symbols
|
|
||||||
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
diff --git a/libgo/config/ltmain.sh b/libgo/config/ltmain.sh
|
|
||||||
index ce66b44906a..0f81c401407 100644
|
|
||||||
--- a/libgo/config/ltmain.sh
|
|
||||||
+++ b/libgo/config/ltmain.sh
|
|
||||||
@@ -2917,7 +2917,7 @@ func_extract_archives ()
|
|
||||||
darwin_file=
|
|
||||||
darwin_files=
|
|
||||||
for darwin_file in $darwin_filelist; do
|
|
||||||
- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
|
|
||||||
+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
|
|
||||||
$LIPO -create -output "$darwin_file" $darwin_files
|
|
||||||
done # $darwin_filelist
|
|
||||||
$RM -rf unfat-$$
|
|
||||||
@@ -2932,7 +2932,7 @@ func_extract_archives ()
|
|
||||||
func_extract_an_archive "$my_xdir" "$my_xabs"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
|
|
||||||
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
|
|
||||||
done
|
|
||||||
|
|
||||||
func_extract_archives_result="$my_oldobjs"
|
|
||||||
diff --git a/libhsail-rt/configure b/libhsail-rt/configure
|
|
||||||
index a4fcc10c1f9..8e671229fcd 100755
|
|
||||||
--- a/libhsail-rt/configure
|
|
||||||
+++ b/libhsail-rt/configure
|
|
||||||
@@ -12244,20 +12244,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
prelink_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
||||||
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
||||||
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
||||||
old_archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
||||||
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
||||||
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
||||||
$RANLIB $oldlib'
|
|
||||||
archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
archive_expsym_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
;;
|
|
||||||
*) # Version 6 and above use weak symbols
|
|
||||||
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
diff --git a/libitm/configure b/libitm/configure
|
|
||||||
index dbf386db434..29d4f10611f 100644
|
|
||||||
--- a/libitm/configure
|
|
||||||
+++ b/libitm/configure
|
|
||||||
@@ -13067,20 +13067,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
prelink_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
||||||
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
||||||
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
||||||
old_archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
||||||
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
||||||
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
||||||
$RANLIB $oldlib'
|
|
||||||
archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
archive_expsym_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
;;
|
|
||||||
*) # Version 6 and above use weak symbols
|
|
||||||
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
diff --git a/liboffloadmic/configure b/liboffloadmic/configure
|
|
||||||
index f873716991b..7aa9186b10e 100644
|
|
||||||
--- a/liboffloadmic/configure
|
|
||||||
+++ b/liboffloadmic/configure
|
|
||||||
@@ -12379,20 +12379,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
prelink_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
||||||
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
||||||
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
||||||
old_archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
||||||
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
||||||
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
||||||
$RANLIB $oldlib'
|
|
||||||
archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
archive_expsym_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
;;
|
|
||||||
*) # Version 6 and above use weak symbols
|
|
||||||
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
diff --git a/liboffloadmic/plugin/configure b/liboffloadmic/plugin/configure
|
|
||||||
index c031eb3e7fa..67fc7368f21 100644
|
|
||||||
--- a/liboffloadmic/plugin/configure
|
|
||||||
+++ b/liboffloadmic/plugin/configure
|
|
||||||
@@ -12086,20 +12086,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
prelink_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
||||||
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
||||||
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
||||||
old_archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
||||||
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
||||||
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
||||||
$RANLIB $oldlib'
|
|
||||||
archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
archive_expsym_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
;;
|
|
||||||
*) # Version 6 and above use weak symbols
|
|
||||||
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
diff --git a/libsanitizer/configure b/libsanitizer/configure
|
|
||||||
index 4695bc7d4f7..cb7d25c07e6 100755
|
|
||||||
--- a/libsanitizer/configure
|
|
||||||
+++ b/libsanitizer/configure
|
|
||||||
@@ -13308,20 +13308,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
prelink_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
||||||
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
||||||
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
||||||
old_archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
||||||
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
||||||
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
||||||
$RANLIB $oldlib'
|
|
||||||
archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
archive_expsym_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
;;
|
|
||||||
*) # Version 6 and above use weak symbols
|
|
||||||
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
|
|
||||||
index 61457e940ec..21ef1f61e41 100755
|
|
||||||
--- a/libstdc++-v3/configure
|
|
||||||
+++ b/libstdc++-v3/configure
|
|
||||||
@@ -13087,20 +13087,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
prelink_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
||||||
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
||||||
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
||||||
old_archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
||||||
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
||||||
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
||||||
$RANLIB $oldlib'
|
|
||||||
archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
archive_expsym_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
;;
|
|
||||||
*) # Version 6 and above use weak symbols
|
|
||||||
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
diff --git a/libtool.m4 b/libtool.m4
|
|
||||||
index 24d13f34409..940faaa161d 100644
|
|
||||||
--- a/libtool.m4
|
|
||||||
+++ b/libtool.m4
|
|
||||||
@@ -6005,20 +6005,20 @@ if test "$_lt_caught_CXX_error" != yes; then
|
|
||||||
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
||||||
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
||||||
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
||||||
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
||||||
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
||||||
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
||||||
$RANLIB $oldlib'
|
|
||||||
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
;;
|
|
||||||
*) # Version 6 and above use weak symbols
|
|
||||||
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
diff --git a/libvtv/configure b/libvtv/configure
|
|
||||||
index a197f750453..31ab3a0637b 100755
|
|
||||||
--- a/libvtv/configure
|
|
||||||
+++ b/libvtv/configure
|
|
||||||
@@ -13339,20 +13339,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
||||||
prelink_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
|
|
||||||
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
|
|
||||||
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
|
|
||||||
old_archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
|
|
||||||
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
|
|
||||||
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
|
|
||||||
$RANLIB $oldlib'
|
|
||||||
archive_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
archive_expsym_cmds_CXX='tpldir=Template.dir~
|
|
||||||
rm -rf $tpldir~
|
|
||||||
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
|
|
||||||
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
||||||
;;
|
|
||||||
*) # Version 6 and above use weak symbols
|
|
||||||
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
||||||
diff --git a/ltmain.sh b/ltmain.sh
|
|
||||||
index 9503ec85d70..79f9ba89af5 100644
|
|
||||||
--- a/ltmain.sh
|
|
||||||
+++ b/ltmain.sh
|
|
||||||
@@ -2917,7 +2917,7 @@ func_extract_archives ()
|
|
||||||
darwin_file=
|
|
||||||
darwin_files=
|
|
||||||
for darwin_file in $darwin_filelist; do
|
|
||||||
- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
|
|
||||||
+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
|
|
||||||
$LIPO -create -output "$darwin_file" $darwin_files
|
|
||||||
done # $darwin_filelist
|
|
||||||
$RM -rf unfat-$$
|
|
||||||
@@ -2932,7 +2932,7 @@ func_extract_archives ()
|
|
||||||
func_extract_an_archive "$my_xdir" "$my_xabs"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
|
|
||||||
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
|
|
||||||
done
|
|
||||||
|
|
||||||
func_extract_archives_result="$my_oldobjs"
|
|
||||||
Loading…
Add table
Reference in a new issue