-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Simplify satellite def file usage #2501
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
I don't think LIBRARYNAME is needed
Please compare |
|
Marking as |
|
The diff of 5c5
< Dump of file C:\Project\STL\out\build\x64_main\out\bin\amd64\msvcp140_atomic_wait_oss.dll
---
> Dump of file C:\Project\STL\out\build\x64\out\bin\amd64\msvcp140_atomic_wait_oss.dll
14c14
< 61FD80AF time date stamp Fri Feb 4 21:38:23 2022
---
> 61FD821D time date stamp Fri Feb 4 21:44:29 2022
40c40
< 1A74A checksum
---
> 11666 checksum
1182c1182
< 0000000180005980: 00 00 00 00 AF 80 FD 61 00 00 00 00 02 00 00 00 ....Ї.эa........
---
> 0000000180005980: 00 00 00 00 1D 82 FD 61 00 00 00 00 02 00 00 00 ......эa........
1184c1184
< 00000001800059A0: AF 80 FD 61 00 00 00 00 0D 00 00 00 DC 02 00 00 Ї.эa........Ь...
---
> 00000001800059A0: 1D 82 FD 61 00 00 00 00 0D 00 00 00 DC 02 00 00 ..эa........Ь...
1247,1248c1247,1248
< 0000000180005D90: C5 01 00 00 52 53 44 53 45 64 18 3E 84 DE 28 40 Е...RSDSEd.>.Ю(@
< 0000000180005DA0: BE FF 6E 9D 32 2D 8C 59 26 00 00 00 43 3A 5C 50 ѕяn.2-.Y&...C:\P
---
> 0000000180005D90: C5 01 00 00 52 53 44 53 24 91 2B FA C0 0E 94 47 Е...RSDS$.+ъА..G
> 0000000180005DA0: B5 20 85 7B 85 30 2B 92 01 00 00 00 43 3A 5C 50 µ .{.0+.....C:\P
1418,1419c1418,1419
< 0000000180006840: 1C 00 1D 00 1E 00 1F 00 4D 53 56 43 50 31 34 30 ........MSVCP140
< 0000000180006850: 5F 41 54 4F 4D 49 43 5F 57 41 49 54 5F 4F 53 53 _ATOMIC_WAIT_OSS
---
> 0000000180006840: 1C 00 1D 00 1E 00 1F 00 6D 73 76 63 70 31 34 30 ........msvcp140
> 0000000180006850: 5F 61 74 6F 6D 69 63 5F 77 61 69 74 5F 6F 73 73 _atomic_wait_oss
1633,1634c1633,1634
< 61FD80AF cv 60 00005D94 4B94 Format: RSDS, {3E186445-DE84-4028-BEFF-6E9D322D8C59}, 38, C:\Project\STL\out\build\x64\out\bin\amd64\msvcp140_atomic_wait_oss.pdb
< 61FD80AF coffgrp 2DC 00005DF4 4BF4 4C544347 (LTCG)
---
> 61FD821D cv 60 00005D94 4B94 Format: RSDS, {FA2B9124-0EC0-4794-B520-857B85302B92}, 1, C:\Project\STL\out\build\x64\out\bin\amd64\msvcp140_atomic_wait_oss.pdb
> 61FD821D coffgrp 2DC 00005DF4 4BF4 4C544347 (LTCG)
1636c1636
< Section contains the following exports for MSVCP140_ATOMIC_WAIT_OSS.dll
---
> Section contains the following exports for msvcp140_atomic_wait_oss.dll |
|
This actually breaks the internal build with I'm not sure how this is happening but we'll need to resolve this. |
|
Comparing VS 2022 17.1 Preview 5's
I observe no |
|
Exporting from a DLL Using DEF Files says:
|
Still, LIBRARY says:
So it seems the name is optional, and we may use empty |
|
Closing as we discussed on Discord - we might investigate this later after overhauling the internal build to use CMake instead of MSBuild. Thanks again for looking into this! |
I don't think LIBRARYNAME is needed, although I may be missing something.
@BillyONeal indicated
.srcwas introduced to make MSBuild and CMake output match.Unfortunately, I cannot make MSBuild here, so I can't look into the issue.
But I want to solve this somehow simpler for a new satellite in #2502