Skip to content

Commit 93bd166

Browse files
committed
Merge branch 'feature/dockerdevenv' of github.com:secure-software-engineering/phasar into feature/dockerdevenv
2 parents c78bfd0 + deab839 commit 93bd166

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.docker/Dockerfile.devenv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ USER vscode
1515

1616
ENV CC "$(which clang-14)"
1717
ENV CXX "$(which clang++-14)"
18-
ENV CMAKE_GENERATOR "Ninja"
18+
ENV CMAKE_GENERATOR "Ninja"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ Done!
7474

7575
### Installing PhASAR a MacOS system
7676
Due to unfortunate updates to MacOS and the handling of C++, especially on the newer M1 processors, we can't support native development on Mac.
77-
The easiest solution to develop PhASAR on a Mac right now is to use [dockers development environments](https://docs.docker.com/desktop/dev-environments/). Clone this repository as described in the documentation. Afterwards, login as a root user using `docker exec -it -u root <container name> /bin/bash` to complete the rest of the install process as described in this readme (install submodules, run bootstrap.sh, ...).
78-
Now you can just attach your docker container to VS Code or any other IDE, which supports remove development.
77+
The easiest solution to develop PhASAR on a Mac right now is to use [dockers development environments](https://docs.docker.com/desktop/dev-environments/). Clone this repository as described in their documentation. Afterwards, you have to login once manually, as a root user by running `docker exec -it -u root <container name> /bin/bash` to complete the rest of the install process as described in this readme (install submodules, run bootstrap.sh, ...).
78+
Now you can just attach your docker container to VS Code or any other IDE, which supports remote development.
7979

8080
### Compiling PhASAR (if not already done using the installation scripts)
8181
Set the system's variables for the C and C++ compiler to clang:

0 commit comments

Comments
 (0)