diff options
| author | guo <[email protected]> | 2021-10-14 15:21:36 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-14 15:21:36 +0800 |
| commit | 92ea0ec8c7a42cd366c5285c1e55fc7d21dcdf93 (patch) | |
| tree | 37a6d4ac0674934778c39aef25b72a309a9f010a /bsp/nrf5x | |
| parent | acc754726498c5dbe3697cba8916d7b4cb1737e7 (diff) | |
| parent | b1baf42d4ea5e35c54237c063d78b544e3a7a02e (diff) | |
Merge pull request #5178 from RT-Thread/revert-5171-ccflags
Revert "Fix compiler flags issue"
Diffstat (limited to 'bsp/nrf5x')
| -rw-r--r-- | bsp/nrf5x/libraries/templates/nrfx/SConstruct | 2 | ||||
| -rw-r--r-- | bsp/nrf5x/nrf51822/SConstruct | 2 | ||||
| -rw-r--r-- | bsp/nrf5x/nrf52832/SConstruct | 2 | ||||
| -rw-r--r-- | bsp/nrf5x/nrf52840/SConstruct | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/bsp/nrf5x/libraries/templates/nrfx/SConstruct b/bsp/nrf5x/libraries/templates/nrfx/SConstruct index d0c5a5cdd5..2ac1ce6674 100644 --- a/bsp/nrf5x/libraries/templates/nrfx/SConstruct +++ b/bsp/nrf5x/libraries/templates/nrfx/SConstruct @@ -20,7 +20,7 @@ TARGET = 'rt-thread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, - CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS, AR = rtconfig.AR, ARFLAGS = '-rc', LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) env.PrependENVPath('PATH', rtconfig.EXEC_PATH) diff --git a/bsp/nrf5x/nrf51822/SConstruct b/bsp/nrf5x/nrf51822/SConstruct index d0c5a5cdd5..2ac1ce6674 100644 --- a/bsp/nrf5x/nrf51822/SConstruct +++ b/bsp/nrf5x/nrf51822/SConstruct @@ -20,7 +20,7 @@ TARGET = 'rt-thread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, - CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS, AR = rtconfig.AR, ARFLAGS = '-rc', LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) env.PrependENVPath('PATH', rtconfig.EXEC_PATH) diff --git a/bsp/nrf5x/nrf52832/SConstruct b/bsp/nrf5x/nrf52832/SConstruct index d0c5a5cdd5..2ac1ce6674 100644 --- a/bsp/nrf5x/nrf52832/SConstruct +++ b/bsp/nrf5x/nrf52832/SConstruct @@ -20,7 +20,7 @@ TARGET = 'rt-thread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, - CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS, AR = rtconfig.AR, ARFLAGS = '-rc', LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) env.PrependENVPath('PATH', rtconfig.EXEC_PATH) diff --git a/bsp/nrf5x/nrf52840/SConstruct b/bsp/nrf5x/nrf52840/SConstruct index d0c5a5cdd5..2ac1ce6674 100644 --- a/bsp/nrf5x/nrf52840/SConstruct +++ b/bsp/nrf5x/nrf52840/SConstruct @@ -20,7 +20,7 @@ TARGET = 'rt-thread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS, - CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS, + CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS, AR = rtconfig.AR, ARFLAGS = '-rc', LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) env.PrependENVPath('PATH', rtconfig.EXEC_PATH) |