Skip to content

Commit

Permalink
Let user specify compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
Ned Williamson committed Oct 15, 2021
1 parent 5f282c0 commit 801269c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
cmake_minimum_required(VERSION 3.5.1)
project(sockfuzzer)

set(CMAKE_C_COMPILER clang)
set(CMAKE_CXX_COMPILER clang++)
# TODO(nedwill): We should not depend directly on third_party module paths
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/third_party/libprotobuf-mutator/cmake/external)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
Expand Down Expand Up @@ -570,7 +568,7 @@ if(NOT DEFINED ENV{SANITIZER} AND NOT APPLE)
endif()

# TODO(nedwill): get the local protobuf build working to support msan
# include(protobuf)
# add_subdirectory(third_party/libprotobuf-mutator)
find_package(Protobuf REQUIRED)
include_directories(${PROTOBUF_INCLUDE_DIRS})
include_directories(${CMAKE_CURRENT_BINARY_DIR})
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ RUN ./configure --disable-shared
RUN make -j $(nproc)
RUN make install

WORKDIR $SRC
# You can now build using cmake. I use a subdirectory "build".
COPY build.sh $SRC
WORKDIR /source/build
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ for your platform. For example:

```
$ mkdir build; cd build
$ cmake -GNinja ..
$ CC=clang CXX=clang++ cmake -GNinja ..
$ ninja
```

Expand Down

0 comments on commit 801269c

Please sign in to comment.