Skip to content

Commit a1c66b3

Browse files
committed
meson: use plain nasm by default
nasm-segelf is not widely available. :(
1 parent 48eae09 commit a1c66b3

3 files changed

Lines changed: 29 additions & 4 deletions

File tree

configure.meson

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
#!/usr/bin/env bash
22

33
usage() {
4-
echo "$0 [-b <build_dir>] [-c] [-d] [-- <meson_args>]"
5-
echo -e "\t-c selects clang for build"
4+
echo "$0 [-b <build_dir>] [-c] [-s] [-d] [-- <meson_args>]"
5+
echo -e "\t-c selects clang instead of gcc"
6+
echo -e "\t-s selects nasm-segelf instead of nasm"
67
}
78

89
CROSS_F="toolchain.ini"
910
BLD="build"
1011

11-
while getopts "b:cdh" opt; do
12+
while getopts "b:csdh" opt; do
1213
case "$opt" in
1314
b)
1415
BLD="$OPTARG"
1516
;;
1617
c)
1718
CROSS_F="toolchain-clang.ini"
1819
;;
20+
s)
21+
CROSS_F="toolchain-segelf.ini"
22+
;;
1923
d)
2024
DEBUG="1"
2125
;;

fdpp/kernel/toolchain-segelf.ini

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[binaries]
2+
nasm = 'nasm-segelf'
3+
c = 'gcc'
4+
c_ld = 'bfd'
5+
cpp = 'g++'
6+
# Note: strip is currently unused. Compatible GNU strip is since binutils-2.42
7+
strip = 'strip'
8+
pkg-config = 'pkg-config'
9+
10+
[properties]
11+
needs_exe_wrapper = false
12+
13+
[constants]
14+
arch = 'i386-linux-gnu'
15+
16+
[host_machine]
17+
system = 'linux'
18+
cpu_family = 'x86'
19+
cpu = 'i386'
20+
endian = 'little'
21+

fdpp/kernel/toolchain.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[binaries]
2-
nasm = 'nasm-segelf'
2+
nasm = 'nasm'
33
c = 'gcc'
44
c_ld = 'bfd'
55
cpp = 'g++'

0 commit comments

Comments
 (0)