Skip to content
This repository was archived by the owner on Dec 6, 2018. It is now read-only.

Commit ac3c720

Browse files
committed
Fix clang wrapper issue on Nix
Essentially, backporting 741ebd9
1 parent e2e8c94 commit ac3c720

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let
77
in with pkgs; {
88
coreEnv = stdenv.mkDerivation {
99
name = "thecore";
10-
buildInputs = [ cmake gcc6 cppcheck cpputest gcc-arm-embedded-5 doxygen clang openocd ];
10+
buildInputs = [ cmake gcc6 cppcheck cpputest gcc-arm-embedded-5 doxygen llvmPackages.clang-unwrapped openocd ];
1111
shellHook = ''
1212
export GCC_ARM_EMBEDDED_PATH=${gcc-arm-embedded-5}
1313
'';

examples/cs43l22_audio/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ cmake_minimum_required(VERSION 3.2)
33
# The Core framework directory.
44
set(CORE_DIR ../../)
55

6+
# Obvious.
7+
project(cs43l22_audio)
8+
69
# Required.
710
include(${CORE_DIR}/build_api.cmake)
811

9-
# Objvious.
10-
project(cs43l22_audio)
11-
1212
# Our demo sources.
1313
add_executable(audio main.cpp target.cpp)
1414

examples/host_hello/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ cmake_minimum_required(VERSION 3.2)
33
# The Core framework directory.
44
set(CORE_DIR ../../)
55

6-
# Required.
7-
include(${CORE_DIR}/build_api.cmake)
8-
96
# Objvious.
107
project(host_hello)
118

9+
# Required.
10+
include(${CORE_DIR}/build_api.cmake)
11+
1212
# Required flags for this demo
1313
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
1414
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")

examples/stm32f4_exti/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ cmake_minimum_required(VERSION 3.2)
33
# The Core framework directory.
44
set(CORE_DIR ../../)
55

6+
# Obvious.
7+
project(exti_to_uart)
8+
69
# Required.
710
include(${CORE_DIR}/build_api.cmake)
811

9-
# Objvious.
10-
project(exti_to_uart)
11-
1212
# Required flags for this demo
1313
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
1414
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")

lib/thread/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if(DEFINED CONFIG_OS)
44
message(STATUS "OS selected: ${CONFIG_OS}")
55
if(CONFIG_OS STREQUAL "freertos")
66
add_subdirectory(freertos)
7-
else(CONFIG_OS STREQUAL "host")
7+
elseif(CONFIG_OS STREQUAL "host")
88
if(UNIX)
99
add_subdirectory(posix)
1010
else()

0 commit comments

Comments
 (0)