Skip to content

Commit 9a337cb

Browse files
committed
Merge pull request dotnet#14 from dotnet/rich-buildupdate
Change pathing in documentation to match build update
2 parents 0bd7f64 + 9e9036e commit 9a337cb

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

Linux-instructions.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To build the runtime on Linux, run build.sh from the root of the coreclr reposit
5151
ellismg@linux:~/git/coreclr$ ./build.sh
5252
```
5353

54-
After the build is completed, there should some files placed in ```binaries/Product/linux.x64.debug```. The ones we are interested in are:
54+
After the build is completed, there should some files placed in ```bin/Product/Linux.x64.Debug```. The ones we are interested in are:
5555

5656
* ```corerun```: The command line host. This program loads and starts the CoreCLR runtime and passes the managed program you want to run to it.
5757
* ```libcoreclr.so```: The CoreCLR runtime itself.
@@ -60,8 +60,8 @@ In order to keep everything tidy, let's create a new directory for the runtime a
6060

6161
```
6262
ellismg@linux:~/git/coreclr$ mkdir -p ~/coreclr-demo/runtime
63-
ellismg@linux:~/git/coreclr$ cp binaries/Product/linux.x64.debug/corerun ~/coreclr-demo/runtime
64-
ellismg@linux:~/git/coreclr$ cp binaries/Product/linux.x64.debug/libcoreclr.so ~/coreclr-demo/runtime
63+
ellismg@linux:~/git/coreclr$ cp bin/Product/Linux.x64.Debug/corerun ~/coreclr-demo/runtime
64+
ellismg@linux:~/git/coreclr$ cp bin/Product/Linux.x64.Debug/libcoreclr.so ~/coreclr-demo/runtime
6565
```
6666

6767
Build the Framework
@@ -72,10 +72,10 @@ We don't _yet_ have support for building managed code on Linux, so you'll need a
7272
You will build ```mscorlib.dll``` out of the coreclr repository and the rest of the framework that out of the corefx repository. For mscorlib (from a regular command prompt window) run:
7373

7474
```
75-
D:\git\coreclr> build.cmd unixmscorlib
75+
D:\git\coreclr> build.cmd linuxmscorlib
7676
```
7777

78-
The output is placed in ```binaries\intermediates\Unix.x64.Debug\mscorlib.dll```. You'll want to copy this to the runtime folder on your Linux machine. (e.g. ```~/coreclr-demo/runtime```)
78+
The output is placed in ```bin\obj\Unix.x64.Debug\mscorlib.dll```. You'll want to copy this to the runtime folder on your Linux machine. (e.g. ```~/coreclr-demo/runtime```)
7979

8080
For the rest of the framework, you need to pass some special parameters to build.cmd when building out of the CoreFX repository.
8181

OS-X-instructions.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ To Build CoreCLR, run build.sh from the root of the coreclr repo.
6161

6262
[Lots of stuff before this]
6363
Repo successfully built.
64-
Product binaries are available at /Users/richlander/git/coreclr/binaries/Product/mac.x64.debug
64+
Product binaries are available at /Users/richlander/git/coreclr/bin/Product/mac.x64.debug
6565

6666

6767
Type `./build.sh -?` to see the full set of build options.
6868

6969
Check the build output.
7070

71-
dotnet-mbp:coreclr richlander$ ls binaries/Product/mac.x64.debug/
71+
dotnet-mbp:coreclr richlander$ ls bin/Product/mac.x64.debug/
7272

7373
You will see several files. The interesting ones are:
7474

@@ -77,8 +77,8 @@ You will see several files. The interesting ones are:
7777

7878
Copy the runtime and corerun into the demo directory.
7979

80-
dotnet-mbp:coreclr richlander$ cp binaries/Product/mac.x64.debug/corerun ~/coreclr-demo/runtime/
81-
dotnet-mbp:coreclr richlander$ cp binaries/Product/mac.x64.debug/libcoreclr.dylib ~/coreclr-demo/runtime/
80+
dotnet-mbp:coreclr richlander$ cp bin/Product/mac.x64.debug/corerun ~/coreclr-demo/runtime/
81+
dotnet-mbp:coreclr richlander$ cp bin/Product/mac.x64.debug/libcoreclr.dylib ~/coreclr-demo/runtime/
8282

8383
Build the Framework
8484
===================
@@ -94,11 +94,11 @@ Build mscorlb
9494

9595
Build mscorlib.dll out of the coreclr repository:
9696

97-
C:\git\coreclr>build.cmd unixmscorlib
97+
C:\git\coreclr>build.cmd osxmscorlib
9898

99-
The output is placed in `binaries\intermediates\Unix.x64.Debug`. Copy to the demo folder.
99+
The output is placed in `bin\obj\Unix.x64.Debug`. Copy to the demo folder.
100100

101-
C:\git\coreclr>copy binaries\intermediates\Unix.x64.Debug\mscorlib.dll \coreclr-demo
101+
C:\git\coreclr>copy bin\obj\Unix.x64.Debug\mscorlib.dll \coreclr-demo
102102

103103
Build CoreFX
104104
------------

0 commit comments

Comments
 (0)