Skip to content

Commit

Permalink
vtc: guix builds using -fPIC, --disable-shared
Browse files Browse the repository at this point in the history
  • Loading branch information
vertiond committed May 28, 2022
1 parent 5647a53 commit 25b95c8
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions contrib/guix/libexec/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 25b95c8

Please sign in to comment.