Skip to content

Commit

Permalink
Revert "meson: switch to gcc"
Browse files Browse the repository at this point in the history
This reverts commit 5654ad9.

This breaks copr build.
  • Loading branch information
stsp committed Jan 2, 2025
1 parent 12d866f commit 9a28775
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions configure.meson
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ fi
TOP=$(dirname "$0")

meson setup \
--native-file $TOP/fdpp/toolchain.ini \
--cross-file $TOP/fdpp/kernel/toolchain.ini \
$* $BLD $TOP
[ "$?" = "0" ] || exit 1
Expand Down
4 changes: 2 additions & 2 deletions fdpp/kernel/toolchain.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[binaries]
nasm = 'nasm-segelf'
c = 'gcc'
c = 'clang'
c_ld = 'bfd'
cpp = 'g++'
cpp = 'clang++'
strip = 'llvm-strip'
pkg-config = 'pkg-config'

Expand Down
6 changes: 4 additions & 2 deletions fdpp/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ hdr = ['src', 'hdr', '.', rel_inc]
incdir2 = include_directories(hdr)
CLANG_VER = meson.get_compiler('cpp').version().split('.')[0]
if get_option('buildtype').startswith('debug')
DEBUG_OPTS = ['-DFDPP_DEBUG', '-DEXTRA_DEBUG']
DEBUG_OPTS = ['-DFDPP_DEBUG', '-DEXTRA_DEBUG', '-fdebug-macro']
else
DEBUG_OPTS = []
endif
Expand All @@ -142,7 +142,9 @@ LIBFDPP = shared_library('fdpp', [ccfiles, ppccf, FDPP_CCFILES, CPPFILES],
version: FVER,
sources: [gad, pac, pap, tc, ta],
cpp_args: ['-DFDPP', '-DDEBUG', '-DWITHFAT32', '-DCLANG_VER=' + CLANG_VER,
DEBUG_OPTS
'-fno-threadsafe-statics',
'-Werror=packed-non-pod', '-Wno-unknown-warning-option',
'-Wno-format-invalid-specifier', '-Wno-c99-designator', DEBUG_OPTS
],
link_args: ['-Wl,-Bsymbolic'],
install: true,
Expand Down
2 changes: 2 additions & 0 deletions fdpp/toolchain.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[binaries]
cpp = 'clang++'

0 comments on commit 9a28775

Please sign in to comment.