diff options
| author | Andres Notzli <andres.noetzli@gmail.com> | 2016-10-13 17:34:38 -0700 |
|---|---|---|
| committer | Andres Notzli <andres.noetzli@gmail.com> | 2016-12-01 16:31:50 -0800 |
| commit | 4f2f73844f1d0f07f3e0fd48079d00be2733533e (patch) | |
| tree | 8aa3f65209f01745998643419f632926f987b304 /src/lib | |
| parent | 9d6a0bda98ac2c3e3c59f55f349e029d623b264a (diff) | |
Fix build on macOS Sierra
Before this fix, the build died with `ar: no archive members specified
when linking the empty libreplacements.la.` because macOS Sierra does
not require the replacements anymore. With this fix, `ffs.c` and
`strtok_r.c` are always getting compiled (even when they are empty) to
prevent the error. Also removed the unused
`CVC4_NEEDS_REPLACEMENT_FUNCTIONS` from `configure.ac` and added an
`#ifndef HAVE_FFS` to `ffs.c` for consistency with `strtok_r.c`.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/ffs.c b/src/lib/ffs.c index 81228be63..d42f9da94 100644 --- a/src/lib/ffs.c +++ b/src/lib/ffs.c @@ -21,6 +21,7 @@ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ +#ifndef HAVE_FFS int ffs(int i) { long mask = 0x1; @@ -35,6 +36,7 @@ int ffs(int i) { return 0; } +#endif /* ifndef HAVE_FFS */ #ifdef __cplusplus }/* extern "C" */ #endif /* __cplusplus */ |