From 25b95c8f88e6d228eaa3ceb8c6b9a53fd355babd Mon Sep 17 00:00:00 2001 From: vertion Date: Sat, 28 May 2022 12:42:52 -0500 Subject: [PATCH] vtc: guix builds using -fPIC, --disable-shared See PR #174 --- contrib/guix/libexec/build.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index efa0620ef4..b6ba40c136 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -240,12 +240,13 @@ mkdir -p "$OUTDIR" CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --disable-fuzz-binary" case "$HOST" in *linux*) CONFIGFLAGS+=" --disable-threadlocal" ;; + *mingw*) CONFIGFLAGS+=" --disable-shared" ;; esac # CFLAGS HOST_CFLAGS="-O2 -g" case "$HOST" in - *linux*) HOST_CFLAGS+=" -ffile-prefix-map=${PWD}=." ;; + *linux*) HOST_CFLAGS+=" -ffile-prefix-map=${PWD}=. -fPIC" ;; *mingw*) HOST_CFLAGS+=" -fno-ident" ;; *darwin*) unset HOST_CFLAGS ;; esac @@ -357,11 +358,11 @@ mkdir -p "$DISTSRC" ( cd installed - case "$HOST" in - *mingw*) - mv --target-directory="$DISTNAME"/lib/ "$DISTNAME"/bin/*.dll - ;; - esac +# case "$HOST" in +# *mingw*) +# mv --target-directory="$DISTNAME"/lib/ "$DISTNAME"/bin/*.dll +# ;; +# esac # Prune libtool and object archives find . -name "lib*.la" -delete