mirror of
https://github.com/platformio/platformio-core.git
synced 2025-07-31 10:37:13 +02:00
Merge ASFLAGS and CCFLAGS in a proper way.
This commit is contained in:
@ -31,10 +31,7 @@ env.Replace(
|
|||||||
|
|
||||||
ARFLAGS=["rcs"],
|
ARFLAGS=["rcs"],
|
||||||
|
|
||||||
ASFLAGS=[
|
ASFLAGS=["-x", "assembler-with-cpp"],
|
||||||
"-x", "assembler-with-cpp",
|
|
||||||
env.subst("$CCFLAGS")
|
|
||||||
],
|
|
||||||
|
|
||||||
CCFLAGS=[
|
CCFLAGS=[
|
||||||
"-g", # include debugging info (so errors include line numbers)
|
"-g", # include debugging info (so errors include line numbers)
|
||||||
@ -71,7 +68,10 @@ env.Replace(
|
|||||||
PROGSUFFIX=".elf"
|
PROGSUFFIX=".elf"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
env.Append(
|
env.Append(
|
||||||
|
ASFLAGS=env.get("CCFLAGS", [])[:],
|
||||||
|
|
||||||
BUILDERS=dict(
|
BUILDERS=dict(
|
||||||
ElfToBin=Builder(
|
ElfToBin=Builder(
|
||||||
action=" ".join([
|
action=" ".join([
|
||||||
|
@ -31,10 +31,7 @@ env.Replace(
|
|||||||
|
|
||||||
ARFLAGS=["rcs"],
|
ARFLAGS=["rcs"],
|
||||||
|
|
||||||
ASFLAGS=[
|
ASFLAGS=["-x", "assembler-with-cpp"],
|
||||||
"-x", "assembler-with-cpp",
|
|
||||||
env.subst("$CCFLAGS")
|
|
||||||
],
|
|
||||||
|
|
||||||
CCFLAGS=[
|
CCFLAGS=[
|
||||||
"-g", # include debugging info (so errors include line numbers)
|
"-g", # include debugging info (so errors include line numbers)
|
||||||
@ -67,6 +64,8 @@ env.Replace(
|
|||||||
)
|
)
|
||||||
|
|
||||||
env.Append(
|
env.Append(
|
||||||
|
ASFLAGS=env.get("CCFLAGS", [])[:],
|
||||||
|
|
||||||
BUILDERS=dict(
|
BUILDERS=dict(
|
||||||
ElfToEep=Builder(
|
ElfToEep=Builder(
|
||||||
action=" ".join([
|
action=" ".join([
|
||||||
|
@ -64,10 +64,7 @@ env.Replace(
|
|||||||
|
|
||||||
ARFLAGS=["rcs"],
|
ARFLAGS=["rcs"],
|
||||||
|
|
||||||
ASFLAGS=[
|
ASFLAGS=["-x", "assembler-with-cpp"],
|
||||||
"-x", "assembler-with-cpp",
|
|
||||||
env.subst("$CCFLAGS")
|
|
||||||
],
|
|
||||||
|
|
||||||
CFLAGS=[
|
CFLAGS=[
|
||||||
"-std=gnu99",
|
"-std=gnu99",
|
||||||
@ -145,6 +142,8 @@ env.Replace(
|
|||||||
)
|
)
|
||||||
|
|
||||||
env.Append(
|
env.Append(
|
||||||
|
ASFLAGS=env.get("CCFLAGS", [])[:],
|
||||||
|
|
||||||
BUILDERS=dict(
|
BUILDERS=dict(
|
||||||
ElfToBin=Builder(
|
ElfToBin=Builder(
|
||||||
action=" ".join([
|
action=" ".join([
|
||||||
|
@ -36,10 +36,7 @@ env.Replace(
|
|||||||
|
|
||||||
ARFLAGS=["rcs"],
|
ARFLAGS=["rcs"],
|
||||||
|
|
||||||
ASFLAGS=[
|
ASFLAGS=["-x", "assembler-with-cpp"],
|
||||||
"-x", "assembler-with-cpp",
|
|
||||||
env.subst("$CCFLAGS")
|
|
||||||
],
|
|
||||||
|
|
||||||
CCFLAGS=[
|
CCFLAGS=[
|
||||||
"-g", # include debugging info (so errors include line numbers)
|
"-g", # include debugging info (so errors include line numbers)
|
||||||
@ -77,6 +74,8 @@ env.Replace(
|
|||||||
)
|
)
|
||||||
|
|
||||||
env.Append(
|
env.Append(
|
||||||
|
ASFLAGS=env.get("CCFLAGS", [])[:],
|
||||||
|
|
||||||
BUILDERS=dict(
|
BUILDERS=dict(
|
||||||
ElfToHex=Builder(
|
ElfToHex=Builder(
|
||||||
action=" ".join([
|
action=" ".join([
|
||||||
|
Reference in New Issue
Block a user