Fix ParseFlags for mbed

This commit is contained in:
Ivan Kravets
2015-11-27 21:59:08 +02:00
parent 332b19f35b
commit 7ce1dd4f5c
2 changed files with 7 additions and 3 deletions

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
VERSION = (2, 3, "6.dev2")
VERSION = (2, 3, "6.dev3")
__version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio"

View File

@ -29,7 +29,7 @@ http://mbed.org/
import re
import xml.etree.ElementTree as ElementTree
from binascii import crc32
from os import walk
from os import getenv, walk
from os.path import basename, isfile, join, normpath
from SCons.Script import DefaultEnvironment, Exit
@ -226,7 +226,11 @@ env.Replace(
)
# restore external build flags
env.ProcessFlags()
env.ProcessFlags([
env.get("BOARD_OPTIONS", {}).get("build", {}).get("extra_flags", None),
env.get("BUILD_FLAGS"),
getenv("PLATFORMIO_BUILD_FLAGS", None),
])
# Hook for K64F and K22F
if board_type in ("frdm_k22f", "frdm_k64f"):