diff options
Diffstat (limited to 'curl/curl/buildfile')
| -rw-r--r-- | curl/curl/buildfile | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/curl/curl/buildfile b/curl/curl/buildfile index 7b88ae7..cdd8f9f 100644 --- a/curl/curl/buildfile +++ b/curl/curl/buildfile @@ -1,5 +1,5 @@ # file : curl/buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file import libs = libcurl%lib{curl} import libs += libca-certificates-curl%lib{ca-certificates-curl} @@ -11,31 +11,26 @@ tsys = $c.target.system # Build options. # -c.poptions += -DHAVE_CONFIG_H +c.poptions += -DBUILDING_CURL -DHAVE_CONFIG_H -# Note that the upstream package uses the -pthread compiler/linker option on -# Linux and FreeBSD. The option is unsupported by build2 so we pass -# -D_REENTRANT and -lpthread preprocessor/linker options instead. -# switch $tclass, $tsys { - case 'linux' | 'bsd' - c.poptions += -D_REENTRANT - case 'windows', 'win32-msvc' c.poptions += -DWIN32 } c.poptions =+ "-I$src_base" "-I$src_base/src" "-I$src_base/lib" -switch $c.class, $tsys +switch $c.class { case 'gcc' { - # Disable the Clang targeting MSVC warnings. + # Disable warnings that pop up with -Wall -Wextra. Upstream doesn't seem + # to care about these and it is not easy to disable specific warnings in a + # way that works across compilers/version (some -Wno-* options are only + # recognized in newer versions). # - if ($c.id == 'clang' && $tsys == 'win32-msvc') - c.coptions += -Wno-deprecated-declarations + c.coptions += -Wno-all -Wno-extra -Wno-deprecated-declarations } case 'msvc' { @@ -48,7 +43,7 @@ switch $c.class, $tsys switch $tclass, $tsys { case 'linux' | 'bsd' - c.libs += -lpthread + c.libs += -pthread case 'windows', 'mingw32' c.libs+= -lws2_32 |