diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2018-07-28 15:50:30 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2018-07-28 15:52:19 +0200 |
| commit | 3140c8b2ca48263da1a1f12b478031dc4b572db7 (patch) | |
| tree | 3b2bf834075b2545ce67c66812ae2b60ca1d894e | |
| parent | aa2ec912f5a557f340a633e95b9fbf2ad7937edd (diff) | |
Move FreeBSD CFLAGS and LDFLAGS to configure
Backport of commit 09c1e370b3084f7acb7c3777427670a69945368a.
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9863a1c..d125e4a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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. .freebsd-11-i386: &freebsd-11-i386_env - variables: - CPPFLAGS: "-I/usr/local/include" - LDFLAGS: "-L/usr/local/lib" tags: - freebsd - i386 @@ -223,9 +220,6 @@ docker_ubuntu-16_04-amd64: #- tags .freebsd-11-amd64: &freebsd-11-amd64_env - variables: - CPPFLAGS: "-I/usr/local/include" - LDFLAGS: "-L/usr/local/lib" tags: - freebsd - amd64 diff --git a/configure.ac b/configure.ac index 2c136526..44382e4f 100644 --- a/configure.ac +++ b/configure.ac @@ -216,9 +216,13 @@ else ;; ipv6:freebsd*) sysdesc=bsd-v6 + CPPFLAGS="$CPPFLAGS -I/usr/local/include" + LDFLAGS="$LDFLAGS -L/usr/local/lib" ;; ipv4:freebsd*) sysdesc=bsd + CPPFLAGS="$CPPFLAGS -I/usr/local/include" + LDFLAGS="$LDFLAGS -L/usr/local/lib" ;; ipv6:dragonfly*) sysdesc=bsd-v6 @@ -419,4 +423,5 @@ AC_MSG_RESULT([ Debugging: $enable_debug]) AC_MSG_RESULT([ POSIX threads: $enable_pthreads]) AC_MSG_RESULT([ Routing protocols: $protocols]) AC_MSG_RESULT([ Client: $enable_client]) -rm -f $objdir/.*-stamp
\ No newline at end of file + +rm -f $objdir/.*-stamp |