diff options
| author | Austin Seipp <aseipp@pobox.com> | 2017-11-26 19:29:00 -0600 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2017-12-10 16:06:01 -0600 |
| commit | 997bb216aa37010826067d0cfa33b4fde5aaa225 (patch) | |
| tree | 63e968981b6be6ffa17ccf9612b8c5d2cf639a25 /cmd_device.c | |
| parent | 04035f0c7eaf26ef0a74e36e0edf1adddecb62b5 (diff) | |
build: require explicit include paths for libbcachefs/
This removes the implicit `-I libbcachefs` argument to $(CC), which in turn
requires a set of minor changes throughout the tools. There are two advantages
to this setup:
1) It is (arguably) easier to read, since the location of bcachefs includes
are easier to understand at a glance ("where does util.h live?")
2) It removes the need for a hack to include glibc's copy of
dirent.h explicitly via '/usr/include/dirent.h', because libbcachefs/
*also* has a dirent.h file and the compiler cannot disambiguate them.
This has some ramifications on systems where /usr/include may not
exist, such as NixOS.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'cmd_device.c')
| -rw-r--r-- | cmd_device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd_device.c b/cmd_device.c index e5a2f09e..f2d751c5 100644 --- a/cmd_device.c +++ b/cmd_device.c @@ -12,10 +12,10 @@ #include <sys/types.h> #include <unistd.h> -#include "bcachefs_ioctl.h" +#include "libbcachefs/bcachefs_ioctl.h" #include "cmds.h" #include "libbcachefs.h" -#include "opts.h" +#include "libbcachefs/opts.h" #include "tools-util.h" /* This code belongs under show_fs */ |