From: Willem Jan Withagen <wjw@digiware.nl>
Date: Wed, 6 Mar 2019 22:23:33 +0000 (+0100)
Subject: build: LLVM ld does not like the versioning scheme
X-Git-Tag: v14.1.1~4^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26801%2Fhead;p=ceph.git

build: LLVM ld does not like the versioning scheme

There is a few essentail differences between the way versioning
and a version-map is interpreted for binutils ld and LLVM ld.
The easy way out for the time being is to use the one that works.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---

diff --git a/do_freebsd.sh b/do_freebsd.sh
index ea3caa91dd46..b0f0f5dab31c 100755
--- a/do_freebsd.sh
+++ b/do_freebsd.sh
@@ -15,10 +15,7 @@ fi
 #	-D CMAKE_CXX_COMPILER="/usr/local/bin/clang++-devel" \
 #	-D CMAKE_C_COMPILER="/usr/local/bin/clang-devel" \
 COMPILE_FLAGS="-O0 -g"
-if [ `sysctl -n kern.osreldate` -le 1102000 ]; then
-    # We need to use the llvm linker for linking ceph-dencoder
-    COMPILE_FLAGS="$COMPILE_FLAGS -fuse-ld=/usr/bin/ld.lld"
-fi
+COMPILE_FLAGS="${COMPILE_FLAGS} -fuse-ld=/usr/local/bin/ld -Wno-unused-command-line-argument"
 CMAKE_CXX_FLAGS_DEBUG="$CXX_FLAGS_DEBUG $COMPILE_FLAGS"
 CMAKE_C_FLAGS_DEBUG="$C_FLAGS_DEBUG $COMPILE_FLAGS"
 
diff --git a/install-deps.sh b/install-deps.sh
index 0beda2753c73..b1a5219cfca5 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -201,6 +201,7 @@ EOF
 if [ x$(uname)x = xFreeBSDx ]; then
     $SUDO pkg install -yq \
         devel/babeltrace \
+        devel/binutils \
         devel/git \
         devel/gperf \
         devel/gmake \