Skip to content

Conversation

alexcrichton
Copy link
Member

@alexcrichton alexcrichton commented Jan 31, 2018

Right now this directory is located under:

$sysroot/lib/rustlib/$target/lib/codegen-backends

but after seeing what we do in a few other places it seems that a more
appropriate location would be:

$sysroot/lib/rustlib/$target/codegen-backends

so this commit moves it!

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the small nit r=me. Seems like a good idea...

let libdir = builder.sysroot_libdir(target_compiler, target);
let dst = libdir.join("codegen-backends");
let dst = builder.sysroot_libdir(target_compiler, target)
.parent()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we probably want to make this a dedicated function on builder. It seems like it's a relatively common thing to want (or at least that multiple places want it).

@alexcrichton alexcrichton force-pushed the move-codegen-backends branch from 096a67a to 751e07b Compare January 31, 2018 06:15
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Jan 31, 2018

📌 Commit 751e07b has been approved by Mark-Simulacrum

@kennytm kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 31, 2018
@kennytm
Copy link
Member

kennytm commented Jan 31, 2018

@bors r-

On dist x86_64-pc-windows-msvc this caused the generation of the setup *.exe to fail (see #47900 (comment)):

C:\projects\rust\build\tmp\dist\exe\StdGroup.wxs(10) : error LGHT0204 : ICE30: The target file 'uhhlm_qu.dll|rustc_trans-emscripten.dll' is installed in '[ProgramFiles64Folder]\Rust\lib\rustlib\x86_64-pc-windows-msvc\codegen-backends\' by two different components on an LFN system: 'cmpFFDB7B5AC07F21031D8C07488402ED89' and 'cmp7302F887E802D31A39328313834D30FC'. This breaks component reference counting.
C:\projects\rust\build\tmp\dist\exe\RustcGroup.wxs(131) : error LGHT0204 : ICE30: The target file 'uhhlm_qu.dll|rustc_trans-emscripten.dll' is installed in '[ProgramFiles64Folder]\Rust\lib\rustlib\x86_64-pc-windows-msvc\codegen-backends\' by two different components on an LFN system: 'cmpFFDB7B5AC07F21031D8C07488402ED89' and 'cmp7302F887E802D31A39328313834D30FC'. This breaks component reference counting.
C:\projects\rust\build\tmp\dist\exe\StdGroup.wxs(13) : error LGHT0204 : ICE30: The target file 'sndd9otd.dll|rustc_trans-llvm.dll' is installed in '[ProgramFiles64Folder]\Rust\lib\rustlib\x86_64-pc-windows-msvc\codegen-backends\' by two different components on an LFN system: 'cmpACAD1E9248A80DB0D61999347793BE25' and 'cmp4E1ED49F110474C56F3DF22F4B64AB89'. This breaks component reference counting.
C:\projects\rust\build\tmp\dist\exe\RustcGroup.wxs(134) : error LGHT0204 : ICE30: The target file 'sndd9otd.dll|rustc_trans-llvm.dll' is installed in '[ProgramFiles64Folder]\Rust\lib\rustlib\x86_64-pc-windows-msvc\codegen-backends\' by two different components on an LFN system: 'cmpACAD1E9248A80DB0D61999347793BE25' and 'cmp4E1ED49F110474C56F3DF22F4B64AB89'. This breaks component reference counting.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(686) : warning LGHT1076 : ICE60: The file fil226E8B8CBF0DA974B254794A2434D350 is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(689) : warning LGHT1076 : ICE60: The file filC8EDDF8BBCDDCB1566ECA98618B8A9A9 is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(838) : warning LGHT1076 : ICE60: The file filC8D08EAE1AB96E61AA9FF40FD50497D7 is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(841) : warning LGHT1076 : ICE60: The file fil419C9D8E8AC892A6F68D0CB20928632A is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(915) : warning LGHT1076 : ICE60: The file fil6481BD8CC4D103A2BDAA882EA1F5300D is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(918) : warning LGHT1076 : ICE60: The file fil584BB8753856CFE325700E03AA8FEDE9 is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(3290) : warning LGHT1076 : ICE60: The file fil9312029DB39C049F45E0FEDEA6D1D7BD is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(3293) : warning LGHT1076 : ICE60: The file fil1E0F5048A20F94A89DB672BCE13B811B is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(3456) : warning LGHT1076 : ICE60: The file fil409B9064BB26F3A3FDB3DA9744F17EAD is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(3459) : warning LGHT1076 : ICE60: The file filEEA069C3F84AF806770B1E6899E5F9B6 is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(3849) : warning LGHT1076 : ICE60: The file fil0068B26876A44E997E9DF9810FA092B6 is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(3852) : warning LGHT1076 : ICE60: The file fil45B8857D7B1CE4EED9B410878E085073 is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(3887) : warning LGHT1076 : ICE60: The file filB57A50D769B0B33A48EE3EDE513FCECA is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(3890) : warning LGHT1076 : ICE60: The file fil3AA1A4647885FE46F12C6EECDDA39E00 is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(7984) : warning LGHT1076 : ICE60: The file fil3777BACD6096F2EF6B8685026785C5DE is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\exe\DocsGroup.wxs(7987) : warning LGHT1076 : ICE60: The file filC499383B93441B5F5DE551472954AADD is not a Font, and its version is not a companion file reference. It should have a language specified in the Language column.
C:\projects\rust\build\tmp\dist\rust.wxs(144) : warning LGHT1076 : ICE61: This product should remove only older versions of itself. The Maximum version is not less than the current product. (1.25.65535 1.25.0.0)
command did not execute successfully: "C:\\Program Files (x86)\\WiX Toolset v3.11\\bin/light.exe" "-nologo" "-ext" "WixUIExtension" "-ext" "WixUtilExtension" "-out" "C:\\projects\\rust\\build\\tmp/dist\\exe\\rust-nightly-x86_64-pc-windows-msvc.msi" "rust.wixobj" "ui.wixobj" "rustwelcomedlg.wixobj" "RustcGroup.wixobj" "DocsGroup.wixobj" "CargoGroup.wixobj" "StdGroup.wixobj" "AnalysisGroup.wixobj" "RlsGroup.wixobj" "-sice:ICE57"
expected success, got: exit code: 204

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 31, 2018
@alexcrichton alexcrichton force-pushed the move-codegen-backends branch from 751e07b to 0e69f2d Compare January 31, 2018 15:11
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Jan 31, 2018

📌 Commit 0e69f2d has been approved by Mark-Simulacrum

self.sysroot_libdir(compiler, compiler.host)
.parent()
.unwrap()
.join("codegen-backends")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit pick: x.parent().unwrap().join("y") is the same as x.with_file_name("y") (unless x is root).

Right now this directory is located under:

  $sysroot/lib/rustlib/$target/lib/codegen-backends

but after seeing what we do in a few other places it seems that a more
appropriate location would be:

  $sysroot/lib/rustlib/$target/codegen-backends

so this commit moves it!
@alexcrichton alexcrichton force-pushed the move-codegen-backends branch from 0e69f2d to 8ebe542 Compare January 31, 2018 18:16
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Jan 31, 2018

📌 Commit 8ebe542 has been approved by Mark-Simulacrum

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 31, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Jan 31, 2018
… r=alexcrichton

rustc: Move location of `codegen-backends` dir

Right now this directory is located under:

```
$sysroot/lib/rustlib/$target/lib/codegen-backends
```

but after seeing what we do in a few other places it seems that a more
appropriate location would be:

```
$sysroot/lib/rustlib/$target/codegen-backends
```

so this commit moves it!
bors added a commit that referenced this pull request Jan 31, 2018
Rollup of 16 pull requests

- Successful merges: #47838, #47840, #47844, #47874, #47875, #47876, #47884, #47886, #47889, #47890, #47891, #47795, #47677, #47893, #47895, #47552
- Failed merges:
@bors bors merged commit 8ebe542 into rust-lang:master Jan 31, 2018
@alexcrichton alexcrichton deleted the move-codegen-backends branch February 26, 2018 23:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants