From c0e225c07b80e08ae650aa2ba52d5b69c4c8e041 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Thu, 6 Oct 2016 10:15:37 +0200 Subject: [PATCH] travis: disable gold linker with OSX It seems it is not compiled anymore. See: https://travis-ci.org/vincentbernat/lldpd/jobs/165445935 --- tests/ci/run.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/ci/run.sh b/tests/ci/run.sh index a3707d91..83fd6569 100755 --- a/tests/ci/run.sh +++ b/tests/ci/run.sh @@ -3,13 +3,19 @@ set -e [ $CC != gcc ] || CC=gcc-5 -[ $(uname -s) != Linux ] || LLDPD_CONFIG_ARGS="$LLDPD_CONFIG_ARGS --enable-sanitizers" +LLDPD_CONFIG_ARGS="$LLDPD_CONFIG_ARGS --enable-pie" +LLDPD_CONFIG_ARGS="$LLDPD_CONFIG_ARGS --localstatedir=/var --sysconfdir=/etc --prefix=/usr" +case "$(uname -s)" in + Linux) + LLDPD_CONFIG_ARGS="$LLDPD_CONFIG_ARGS --enable-sanitizers" + ;; + Darwin) + LLDPD_CONFIG_ARGS="$LLDPD_CONFIG_ARGS LDFLAGS=-fuse-ld=gold" + ;; +esac ./autogen.sh -./configure $LLDPD_CONFIG_ARGS \ - --enable-pie \ - --localstatedir=/var --sysconfdir=/etc --prefix=/usr \ - CFLAGS="-O1 -g" LDFLAGS="-fuse-ld=gold" || { +./configure $LLDPD_CONFIG_ARGS CFLAGS="-O1 -g" || { cat config.log exit 1 } -- 2.39.5