diff options
| author | Michael Biebl <mbiebl@gmail.com> | 2017-04-13 10:30:56 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-23 21:47:28 -0400 |
| commit | e17e5ba9bff633b5f2b6e9950b3bb64b59079c74 (patch) | |
| tree | 9444c5744f3f45573c2cc7e10978ef65151147e6 /src/boot/efi | |
| parent | 082ef2adbddecde5432608298a19551319b162c5 (diff) | |
meson: use join_paths consistently
With -Dsplit-usr=true, we set rootprefix to /. This leads to //lib/systemd or
//lib/udev for various dir variables. Using join_paths() avoids this.
Diffstat (limited to 'src/boot/efi')
| -rw-r--r-- | src/boot/efi/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index 858dd4a870..7e0c626f28 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -70,7 +70,7 @@ if have_gnu_efi efi_ldsdir = get_option('efi-ldsdir') if efi_ldsdir == '' - efi_ldsdir = efi_libdir + '/gnuefi' + efi_ldsdir = join_paths(efi_libdir, 'gnuefi') endif efi_incdir = get_option('efi-includedir') @@ -92,7 +92,7 @@ if have_gnu_efi '-Wsign-compare', '-Wno-missing-field-initializers', '-isystem', efi_incdir, - '-isystem', efi_incdir + '/' + efi_arch, + '-isystem', join_paths(efi_incdir, efi_arch), '-include', efi_config_h] if efi_arch == 'x86_64' compile_args += ['-mno-red-zone', |