Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions pkgs/m/marzer.tomlplusplus.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ package = {
},
sha256 = "8517f65938a4faae9ccf8ebb36631a38c1cadfb5efa85d9a72e15b9e97d25155",
-- 1: Form B -> Form A (install() writes mcpp.toml + the module unit).
revision = 1,
-- 2: under the MSVC ABI the module unit builds toml++ without its SSE2 path.
revision = 2,
},
},
macosx = {
Expand All @@ -64,7 +65,8 @@ package = {
},
sha256 = "8517f65938a4faae9ccf8ebb36631a38c1cadfb5efa85d9a72e15b9e97d25155",
-- 1: Form B -> Form A (install() writes mcpp.toml + the module unit).
revision = 1,
-- 2: under the MSVC ABI the module unit builds toml++ without its SSE2 path.
revision = 2,
},
},
windows = {
Expand All @@ -75,7 +77,8 @@ package = {
},
sha256 = "8517f65938a4faae9ccf8ebb36631a38c1cadfb5efa85d9a72e15b9e97d25155",
-- 1: Form B -> Form A (install() writes mcpp.toml + the module unit).
revision = 1,
-- 2: under the MSVC ABI the module unit builds toml++ without its SSE2 path.
revision = 2,
},
},
},
Expand Down Expand Up @@ -122,6 +125,16 @@ local MODULE_UNIT = [==[
module;

#define TOML_UNDEF_MACROS 0
// Under the MSVC ABI (cl, or clang in MSVC mode: both define _MSC_VER),
// no SSE2 path: <emmintrin.h> defines its intrinsics `static inline`, and
// clang gives such a function the same mangled name in every module whose
// global module fragment includes it — a unit importing both `std` (MSVC's
// library includes the intrinsics) and `tomlplusplus` then fails with
// "definition with same mangled name". Elsewhere SSE2 stays on. toml++ uses
// it only to skip ASCII faster; the scalar path parses the same documents.
#if defined(_MSC_VER)
#define TOML_ENABLE_SIMD 0
#endif
// mcpp#797: a host-module compile is not given this package's include_dirs,
// so reach the header relative to this file (src/modules/ -> include/).
// Same file either way; restore `<toml++/toml.hpp>` once mcpp#797 is settled.
Expand Down
Loading