diff options
| author | Jan Maria Matejka <mq@ucw.cz> | 2018-01-09 16:46:00 +0100 |
|---|---|---|
| committer | Jan Maria Matejka <mq@ucw.cz> | 2018-01-09 16:46:00 +0100 |
| commit | 09c1e370b3084f7acb7c3777427670a69945368a (patch) | |
| tree | ece0840c3577eb7ccf552bfeb0ef106d0e9bf01f | |
| parent | 94f9be80c3686284942ba73670780d27730da997 (diff) | |
Moved freebsd cflags and ldflags to configure
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 482c5004..ff11dda0 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 f73e6264..f4de8f93 100644 --- a/configure.ac +++ b/configure.ac @@ -181,6 +181,8 @@ else ;; freebsd*) sysdesc=bsd + CPPFLAGS="$CPPFLAGS -I/usr/local/include" + LDFLAGS="$LDFLAGS -L/usr/local/lib" ;; kfreebsd*) sysdesc=bsd |