mirror of
https://gitlab.com/xonotic/xonotic
synced 2024-12-15 03:15:33 +00:00
-Wl,--hash-style=sysv not needed or supported on debian etch
Conflicts: all
This commit is contained in:
parent
c8de9e2280
commit
4399289d77
6
all
6
all
@ -992,7 +992,7 @@ case "$cmd" in
|
||||
*)
|
||||
verbose rsync --delete -zLvaSHP "$srcdir"/ "$host:$buildpath/"
|
||||
verbose rsync --delete -zLvaSHP "$depsdir"/ "$host:$buildpath.deps/"
|
||||
verbose ssh "$host" ". ~/.profile && ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && make clean $maketargets $makeflags"
|
||||
verbose ssh "$host" "ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && make clean $maketargets $makeflags"
|
||||
for f in $targetfiles; do
|
||||
verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
|
||||
done
|
||||
@ -1064,13 +1064,13 @@ case "$cmd" in
|
||||
;;
|
||||
release-engine-linux32)
|
||||
verbose "$SELF" release-compile linux32 \
|
||||
'STRIP=: CC="gcc -m32 -g -Wl,--hash-style=sysv -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
|
||||
'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
|
||||
all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
|
||||
release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
|
||||
;;
|
||||
release-engine-linux64)
|
||||
verbose "$SELF" release-compile linux64 \
|
||||
'STRIP=: CC="gcc -m64 -g -Wl,--hash-style=sysv -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
|
||||
'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
|
||||
all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
|
||||
release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
|
||||
;;
|
||||
|
Loading…
Reference in New Issue
Block a user