[openssl] Don't switch from jom to nmake, fix cflags #23726
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
dg0yt
changed the title
JackBoosY
added
the
category:port-bug
fealebenpae
reviewed
Mar 23, 2022
ports/openssl/unix/CMakeLists.txt
Outdated
Comment on lines
64
to
66
| set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BUILD_TYPE}}") | ||
| if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") | ||
| set(CFLAGS "-Wno-error=unused-command-line-argument ${CMAKE_C_FLAGS}") |
There was a problem hiding this comment.
Suggested change
| set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BUILD_TYPE}}") | |
| if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") | |
| set(CFLAGS "-Wno-error=unused-command-line-argument ${CMAKE_C_FLAGS}") | |
| set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BUILD_TYPE}}") | |
| if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") | |
| set(CFLAGS "${CFLAGS} -Wno-error=unused-command-line-argument") |
Otherwise the CFLAGS value above will be clobbered if the compiler is Clang (like when building for Android, for example).
There was a problem hiding this comment.
I see. And for consistency, we should also switch to CMAKE_C_COMPILER_ID. (?)
There was a problem hiding this comment.
FTR CMAKE_CXX_COMPILER_ID was never initialized because of project(openssl C)...
There was a problem hiding this comment.
Oh, that's a very good catch - yes, we should definitely be using CMAKE_C_COMPILER_ID.
FrankXie05
approved these changes
Mar 25, 2022
|
Thanks @dg0yt! |
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.
What does your PR fix?
Avoids change of the build tool during the build process, and consistently uses
VCPKG_CONCURRENCY. Cf. OpenSSL (1.1.1l#4) build failure #22101 (comment).Passes per-build-type cflags on
UNIX. Resolves [openssl] respect build configuration when building for unix #23700.Activates
-Wno-error=unused-command-line-argumentfor clang. Cf. [openssl] Don't switch from jom to nmake, fix cflags #23726 (comment).Which triplets are supported/not supported? Have you updated the CI baseline?
unchanged, no
Does your PR follow the maintainer guide?
yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?yes