diff --git a/ext/eyalroz/module.lb b/ext/eyalroz/module.lb index 8f37ffb357..2c6307ae67 100644 --- a/ext/eyalroz/module.lb +++ b/ext/eyalroz/module.lb @@ -18,16 +18,19 @@ def prepare(module, options): return True def build(env): + is_hosted = env[":target"].identifier.platform == "hosted" + with_long_long = env.get(":io:with_long_long", + "avr" not in env[":target"].identifier.platform) + env.collect(":build:path.include", "modm/ext") env.outbasepath = "modm/ext/printf" env.copy("printf/src/printf/printf.h", "printf.h") files = env.copy("printf/src/printf/printf.c", "printf.c") - env.collect(":build:ccflags", "-Wno-double-promotion", "-Wno-overflow", operations=files) + env.collect(":build:ccflags", "-Wno-overflow", operations=files) - with_long_long = "avr" not in env[":target"].identifier.platform env.substitutions = { - "with_long_long": env.get(":io:with_long_long", with_long_long), - "is_hosted": env[":target"].identifier.platform == "hosted", + "with_long_long": with_long_long, + "is_hosted": is_hosted, } env.template("printf_config.h.in") diff --git a/ext/eyalroz/printf b/ext/eyalroz/printf index 72716295bc..2c7d857481 160000 --- a/ext/eyalroz/printf +++ b/ext/eyalroz/printf @@ -1 +1 @@ -Subproject commit 72716295bcaa14f96ad9725b40dcc9dff0930eac +Subproject commit 2c7d857481e4c0c82ec135d564a33a74470bee64 diff --git a/ext/eyalroz/printf_config.h.in b/ext/eyalroz/printf_config.h.in index 758cb54603..1eb1658059 100644 --- a/ext/eyalroz/printf_config.h.in +++ b/ext/eyalroz/printf_config.h.in @@ -20,19 +20,13 @@ #endif #ifndef PRINTF_DEFAULT_FLOAT_PRECISION -#define PRINTF_DEFAULT_FLOAT_PRECISION 5 -#endif - -#ifndef PRINTF_ALIAS_STANDARD_FUNCTION_NAMES -#define PRINTF_ALIAS_STANDARD_FUNCTION_NAMES {{ 0 if is_hosted else 1 }} +#define PRINTF_DEFAULT_FLOAT_PRECISION 5 #endif #ifndef PRINTF_ALIAS_STANDARD_FUNCTION_NAMES_HARD -#define PRINTF_ALIAS_STANDARD_FUNCTION_NAMES_HARD 0 +#define PRINTF_ALIAS_STANDARD_FUNCTION_NAMES_HARD {{ 0 if is_hosted else 1 }} #endif #ifndef PRINTF_ALIAS_STANDARD_FUNCTION_NAMES_SOFT #define PRINTF_ALIAS_STANDARD_FUNCTION_NAMES_SOFT 0 #endif - -