]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
-Wl,--hash-style=sysv not needed or supported on debian etch
authorRudolf Polzer <divVerent@alientrap.org>
Mon, 13 Sep 2010 08:28:36 +0000 (10:28 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Mon, 13 Sep 2010 08:28:36 +0000 (10:28 +0200)
Conflicts:

all

all

diff --git a/all b/all
index 13668f3f0aff77670e217c7a725ce0449dc9a501..9d366580e468d6a1c9d6836745dd9ee70c975df2 100755 (executable)
--- a/all
+++ b/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'
                ;;