diff --git a/builder/frameworks/_bare.py b/builder/frameworks/_bare.py index f361dd12..5dd183a7 100644 --- a/builder/frameworks/_bare.py +++ b/builder/frameworks/_bare.py @@ -23,7 +23,7 @@ build_mcu = env.get("BOARD_MCU", board.get("build.mcu", "")) env.Append( - ASFLAGS=["-x", "assembler-with-cpp"], + ASPPFLAGS=["-x", "assembler-with-cpp"], CFLAGS=[ "-std=gnu11" @@ -83,5 +83,3 @@ ] ) -# copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode) -env.Append(ASFLAGS=env.get("CCFLAGS", [])[:]) diff --git a/builder/frameworks/arduino/arduino-common.py b/builder/frameworks/arduino/arduino-common.py index b4a97af8..acf7b289 100644 --- a/builder/frameworks/arduino/arduino-common.py +++ b/builder/frameworks/arduino/arduino-common.py @@ -42,20 +42,26 @@ assert os.path.isdir(FRAMEWORK_DIR) +machine_flags = [ + "-mcpu=%s" % board.get("build.cpu"), + "-mthumb", +] + env.Append( - ASFLAGS=["-x", "assembler-with-cpp"], + ASFLAGS=machine_flags, + ASPPFLAGS=[ + "-x", "assembler-with-cpp", + ], CFLAGS=[ "-std=gnu11" ], - CCFLAGS=[ + CCFLAGS=machine_flags + [ "-Os", # optimize for size "-ffunction-sections", # place each function in its own section "-fdata-sections", "-Wall", - "-mcpu=%s" % board.get("build.cpu"), - "-mthumb", "-nostdlib", "--param", "max-inline-insns-single=500" ], @@ -77,10 +83,8 @@ os.path.join(FRAMEWORK_DIR, "libraries") ], - LINKFLAGS=[ + LINKFLAGS=machine_flags + [ "-Os", - "-mcpu=%s" % board.get("build.cpu"), - "-mthumb", "-Wl,--gc-sections", "-Wl,--check-sections", "-Wl,--unresolved-symbols=report-all", diff --git a/builder/frameworks/arduino/arduino-sam.py b/builder/frameworks/arduino/arduino-sam.py index 05bf81c2..dac42d00 100644 --- a/builder/frameworks/arduino/arduino-sam.py +++ b/builder/frameworks/arduino/arduino-sam.py @@ -64,10 +64,6 @@ LIBS=["sam_sam3x8e_gcc_rel", "gcc"] ) -env.Append( - ASFLAGS=env.get("CCFLAGS", [])[:] -) - # # Target: Build Core Library # diff --git a/builder/frameworks/arduino/arduino-samd.py b/builder/frameworks/arduino/arduino-samd.py index 529279f0..f26241ca 100644 --- a/builder/frameworks/arduino/arduino-samd.py +++ b/builder/frameworks/arduino/arduino-samd.py @@ -171,10 +171,6 @@ ] ) -env.Append( - ASFLAGS=env.get("CCFLAGS", [])[:], -) - # # Target: Build Core Library #