Commit 3140c8b2 authored by Ondřej Zajíček's avatar Ondřej Zajíček

Move FreeBSD CFLAGS and LDFLAGS to configure

Backport of commit 09c1e370.
parent aa2ec912
Pipeline #38206 passed with stages
in 7 minutes and 18 seconds
...@@ -211,9 +211,6 @@ docker_ubuntu-16_04-amd64: ...@@ -211,9 +211,6 @@ docker_ubuntu-16_04-amd64:
# TODO We want to copy these BSDs to our own virtual machines, to make sure someone doesn't update them by accident. # TODO We want to copy these BSDs to our own virtual machines, to make sure someone doesn't update them by accident.
.freebsd-11-i386: &freebsd-11-i386_env .freebsd-11-i386: &freebsd-11-i386_env
variables:
CPPFLAGS: "-I/usr/local/include"
LDFLAGS: "-L/usr/local/lib"
tags: tags:
- freebsd - freebsd
- i386 - i386
...@@ -223,9 +220,6 @@ docker_ubuntu-16_04-amd64: ...@@ -223,9 +220,6 @@ docker_ubuntu-16_04-amd64:
#- tags #- tags
.freebsd-11-amd64: &freebsd-11-amd64_env .freebsd-11-amd64: &freebsd-11-amd64_env
variables:
CPPFLAGS: "-I/usr/local/include"
LDFLAGS: "-L/usr/local/lib"
tags: tags:
- freebsd - freebsd
- amd64 - amd64
......
...@@ -216,9 +216,13 @@ else ...@@ -216,9 +216,13 @@ else
;; ;;
ipv6:freebsd*) ipv6:freebsd*)
sysdesc=bsd-v6 sysdesc=bsd-v6
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
;; ;;
ipv4:freebsd*) ipv4:freebsd*)
sysdesc=bsd sysdesc=bsd
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
;; ;;
ipv6:dragonfly*) ipv6:dragonfly*)
sysdesc=bsd-v6 sysdesc=bsd-v6
...@@ -419,4 +423,5 @@ AC_MSG_RESULT([ Debugging: $enable_debug]) ...@@ -419,4 +423,5 @@ AC_MSG_RESULT([ Debugging: $enable_debug])
AC_MSG_RESULT([ POSIX threads: $enable_pthreads]) AC_MSG_RESULT([ POSIX threads: $enable_pthreads])
AC_MSG_RESULT([ Routing protocols: $protocols]) AC_MSG_RESULT([ Routing protocols: $protocols])
AC_MSG_RESULT([ Client: $enable_client]) AC_MSG_RESULT([ Client: $enable_client])
rm -f $objdir/.*-stamp
\ No newline at end of file rm -f $objdir/.*-stamp
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment