[SCons] Remove MAXLINELENGTH override for MSVC #97458
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Repiteo
reviewed
Sep 25, 2024
platform/windows/detect.py
Outdated
| @@ -390,7 +390,12 @@ def configure_msvc(env: "SConsEnvironment", vcvars_msvc_config): | |||
| env.AppendUnique(CPPDEFINES=["R128_STDC_ONLY"]) | |||
| env.extra_suffix = ".llvm" + env.extra_suffix | |||
|
|
|||
| env["MAXLINELENGTH"] = 8192 # Windows Vista and beyond, so always applicable. | |||
| env["MAXLINELENGTH"] = 2048 # Same as SCons default | |||
There was a problem hiding this comment.
The default MAXLINELENGTH for Windows was to accommodate versions earlier than Vista; we don't need to use it. However, this value being here in the first place was due to an old implementation of silence_msvc, which is no longer relevant. I'd either revert this change, or remove the line entirely.
There was a problem hiding this comment.
The default
MAXLINELENGTHfor Windows was to accommodate versions earlier than Vista; we don't need to use it. However, this value being here in the first place was due to an old implementation ofsilence_msvc, which is no longer relevant. I'd either revert this change, or remove the line entirely.
The old value (8192) was causing #96394 to fail due to "line too long" on a 8150 chars line, so it seems windows doesn't doesn't really support 8191 chars as they claim.
Maybe it's something due to wide chars, the terminal config in GH actions, I don't know, but a 8150 chars line is enough to make MSVC fail.
See this run for example:
lib /nologo /OUT:modules\module_mbedtls.windows.template_release.x86_64.lib thirdparty\mbedtls\library\aes.windows.template_release.x86_64.obj thirdparty\mbedtls\library\aesce.windows.template_release.x86_64.obj thirdparty\mbedtls\library\aesni.windows.template_release.x86_64.obj thirdparty\mbedtls\library\aria.windows.template_release.x86_64.obj thirdparty\mbedtls\library\asn1parse.windows.template_release.x86_64.obj thirdparty\mbedtls\library\asn1write.windows.template_release.x86_64.obj thirdparty\mbedtls\library\base64.windows.template_release.x86_64.obj thirdparty\mbedtls\library\bignum.windows.template_release.x86_64.obj thirdparty\mbedtls\library\bignum_core.windows.template_release.x86_64.obj thirdparty\mbedtls\library\bignum_mod_raw.windows.template_release.x86_64.obj thirdparty\mbedtls\library\camellia.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ccm.windows.template_release.x86_64.obj thirdparty\mbedtls\library\chacha20.windows.template_release.x86_64.obj thirdparty\mbedtls\library\chachapoly.windows.template_release.x86_64.obj thirdparty\mbedtls\library\cipher.windows.template_release.x86_64.obj thirdparty\mbedtls\library\cipher_wrap.windows.template_release.x86_64.obj thirdparty\mbedtls\library\cmac.windows.template_release.x86_64.obj thirdparty\mbedtls\library\constant_time.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ctr_drbg.windows.template_release.x86_64.obj thirdparty\mbedtls\library\debug.windows.template_release.x86_64.obj thirdparty\mbedtls\library\des.windows.template_release.x86_64.obj thirdparty\mbedtls\library\dhm.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ecdh.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ecdsa.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ecjpake.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ecp.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ecp_curves.windows.template_release.x86_64.obj thirdparty\mbedtls\library\entropy.windows.template_release.x86_64.obj thirdparty\mbedtls\library\entropy_poll.windows.template_release.x86_64.obj thirdparty\mbedtls\library\error.windows.template_release.x86_64.obj thirdparty\mbedtls\library\gcm.windows.template_release.x86_64.obj thirdparty\mbedtls\library\hkdf.windows.template_release.x86_64.obj thirdparty\mbedtls\library\hmac_drbg.windows.template_release.x86_64.obj thirdparty\mbedtls\library\md.windows.template_release.x86_64.obj thirdparty\mbedtls\library\md5.windows.template_release.x86_64.obj thirdparty\mbedtls\library\memory_buffer_alloc.windows.template_release.x86_64.obj thirdparty\mbedtls\library\mps_reader.windows.template_release.x86_64.obj thirdparty\mbedtls\library\mps_trace.windows.template_release.x86_64.obj thirdparty\mbedtls\library\net_sockets.windows.template_release.x86_64.obj thirdparty\mbedtls\library\nist_kw.windows.template_release.x86_64.obj thirdparty\mbedtls\library\oid.windows.template_release.x86_64.obj thirdparty\mbedtls\library\padlock.windows.template_release.x86_64.obj thirdparty\mbedtls\library\pem.windows.template_release.x86_64.obj thirdparty\mbedtls\library\pk.windows.template_release.x86_64.obj thirdparty\mbedtls\library\pk_ecc.windows.template_release.x86_64.obj thirdparty\mbedtls\library\pk_wrap.windows.template_release.x86_64.obj thirdparty\mbedtls\library\pkcs12.windows.template_release.x86_64.obj thirdparty\mbedtls\library\pkcs5.windows.template_release.x86_64.obj thirdparty\mbedtls\library\pkcs7.windows.template_release.x86_64.obj thirdparty\mbedtls\library\pkparse.windows.template_release.x86_64.obj thirdparty\mbedtls\library\pkwrite.windows.template_release.x86_64.obj thirdparty\mbedtls\library\platform.windows.template_release.x86_64.obj thirdparty\mbedtls\library\platform_util.windows.template_release.x86_64.obj thirdparty\mbedtls\library\poly1305.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_aead.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_cipher.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_client.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_driver_wrappers_no_static.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_ecp.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_ffdh.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_hash.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_mac.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_pake.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_rsa.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_se.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_slot_management.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_crypto_storage.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_its_file.windows.template_release.x86_64.obj thirdparty\mbedtls\library\psa_util.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ripemd160.windows.template_release.x86_64.obj thirdparty\mbedtls\library\rsa.windows.template_release.x86_64.obj thirdparty\mbedtls\library\rsa_alt_helpers.windows.template_release.x86_64.obj thirdparty\mbedtls\library\sha1.windows.template_release.x86_64.obj thirdparty\mbedtls\library\sha3.windows.template_release.x86_64.obj thirdparty\mbedtls\library\sha256.windows.template_release.x86_64.obj thirdparty\mbedtls\library\sha512.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_cache.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_ciphersuites.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_client.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_cookie.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_debug_helpers_generated.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_msg.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_ticket.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_tls.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_tls12_client.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_tls12_server.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_tls13_client.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_tls13_generic.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_tls13_keys.windows.template_release.x86_64.obj thirdparty\mbedtls\library\ssl_tls13_server.windows.template_release.x86_64.obj thirdparty\mbedtls\library\threading.windows.template_release.x86_64.obj thirdparty\mbedtls\library\timing.windows.template_release.x86_64.obj thirdparty\mbedtls\library\version.windows.template_release.x86_64.obj thirdparty\mbedtls\library\version_features.windows.template_release.x86_64.obj thirdparty\mbedtls\library\x509.windows.template_release.x86_64.obj thirdparty\mbedtls\library\x509_create.windows.template_release.x86_64.obj thirdparty\mbedtls\library\x509_crl.windows.template_release.x86_64.obj thirdparty\mbedtls\library\x509_crt.windows.template_release.x86_64.obj thirdparty\mbedtls\library\x509_csr.windows.template_release.x86_64.obj thirdparty\mbedtls\library\x509write.windows.template_release.x86_64.obj thirdparty\mbedtls\library\x509write_crt.windows.template_release.x86_64.obj thirdparty\mbedtls\library\x509write_csr.windows.template_release.x86_64.obj modules\mbedtls\crypto_mbedtls.windows.template_release.x86_64.obj modules\mbedtls\dtls_server_mbedtls.windows.template_release.x86_64.obj modules\mbedtls\packet_peer_mbed_dtls.windows.template_release.x86_64.obj modules\mbedtls\register_types.windows.template_release.x86_64.obj modules\mbedtls\stream_peer_mbedtls.windows.template_release.x86_64.obj modules\mbedtls\tls_context_mbedtls.windows.template_release.x86_64.obj modules\mbedtls\tests\test_crypto_mbedtls.windows.template_release.x86_64.obj
The command line is too long.
There was a problem hiding this comment.
I've updated the PR to completely remove our MAXLINELENGTH override, which seems to work for #96394 .
I assume it's using 2048 which seems to be the SCons default when it properly detects win32
There was a problem hiding this comment.
For me, values up to 8070 are working, 8191 limit probably include something we (and Scons) are not accounting for, like cwd or full path of lib binary. If a higher value is still needed for warning suppression, we probably can subtract MAX_PATH (or set it to 7K to be safe) instead of fully removing it.
There was a problem hiding this comment.
Sorry, I'm not going to waste more time on Microsoft bs operating system.
If anyone has a better solution that works, I'll gladly rebase #96394 on top of that.
There was a problem hiding this comment.
I think this PR is fine as is, removing the explicit override seems to let SCons handle this properly.
If we need to increase the limit manually again, this can be looked into in a follow-up PR.
Faless
force-pushed
the
fix/imagine_its_2024_and_your_os_cant_handle_few_kbs_of_text
branch
from
3e9e312 to
04e81a4
Compare
akien-mga
approved these changes
Sep 26, 2024
akien-mga
added
the
cherrypick:4.3
akien-mga
changed the title
bruvzg
reviewed
Sep 26, 2024
It's not clear what is the actual max value that windows support, but despite their claim of it being 8191 we have been seeing failure with just 8150.
Faless
force-pushed
the
fix/imagine_its_2024_and_your_os_cant_handle_few_kbs_of_text
branch
from
04e81a4 to
395a4fc
Compare
Faless
changed the title
|
Thanks! |
Faless
deleted the
fix/imagine_its_2024_and_your_os_cant_handle_few_kbs_of_text
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It's not clear what is the actual max value that Windows support, but despite their claim of it being 8191 we have been seeing failure with just 8150.