summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2013-09-03 13:19:04 +0400
committerAndrey Nazarov <skuller@skuller.net>2013-09-03 13:41:10 +0400
commit7dd8cc2890095f98855d65b6e5e8c295bfb81bb1 (patch)
treeff3d13b3811d298d838e7ad235e10f37f1697ded
parent4fa372fc0d84875f68591fa8fcfcc68075591eac (diff)
Fix some BSD specific issues with building system.
‘--no-undefined’ linker option seems to be a Linux-only thing, never enable this on BSD. BSD ‘wc -l’ produces leading whitespace that needs to be trimmed before converting to revision number.
-rw-r--r--Makefile2
-rwxr-xr-xversion.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index abe6bf8..4f96296 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ else
CFLAGS_g += -fvisibility=hidden
# Resolve all symbols at link time
- ifneq ($(SYS),OpenBSD)
+ ifeq ($(SYS),Linux)
LDFLAGS_s += -Wl,--no-undefined
LDFLAGS_c += -Wl,--no-undefined
LDFLAGS_g += -Wl,--no-undefined
diff --git a/version.sh b/version.sh
index 0179424..8cde8f0 100755
--- a/version.sh
+++ b/version.sh
@@ -6,7 +6,7 @@ then
rev="`sed -e 's/^r\([0-9]\+\).*$/\1/' VERSION`"
elif [ -x "`which git`" -a -d ".git" ]
then
- rev="`git rev-list HEAD | wc -l`"
+ rev="`git rev-list HEAD | wc -l | tr -d -c 0-9`"
ver="r$rev~`git rev-parse --short HEAD`"
else
echo "WARNING: Couldn't detect Q2PRO version." >&2