Skip to content
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

Only build acvp/modulewrapper with BUILD_TESTING #1012

Merged
merged 2 commits into from
May 15, 2023

Conversation

justsmth
Copy link
Contributor

@justsmth justsmth commented May 15, 2023

Issues:

N/A

Description of changes:

  • Previously when building for FIPS with both -DBUILD_LIBSSL=OFF and -DBUILD_TESTING=OFF, CMake produces an error, and the subsequent build attempt fails.
> cmake "-DFIPS=1" "-DBUILD_LIBSSL=OFF" "-DBUILD_TESTING=OFF" ../aws-lc
...
-- Configuring done
CMake Error: Cannot determine link language for target "modulewrapper".
CMake Error: CMake can not determine linker language for target: modulewrapper
-- Generating done
-- Build files have been written to: /home/justsmth/repos/AWS-LC-BUILD
  • Added a build using these flags to the CI.

Call-outs:

N/A

Testing:

Successfully built using these flags:

> cmake "-DFIPS=1" "-DBUILD_LIBSSL=OFF" "-DBUILD_TESTING=OFF" ../aws-lc
-- Found Threads: TRUE  
-- Configuring done
-- Generating done
-- Build files have been written to: /home/justsmth/repos/AWS-LC-BUILD

> make
...
[ 99%] Built target crypto_objects
Scanning dependencies of target fipsmodule
[ 99%] Building C object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/fips_shared_support.c.o
[100%] Building C object crypto/fipsmodule/CMakeFiles/fipsmodule.dir/cpucap/cpucap.c.o
[100%] Built target fipsmodule
Scanning dependencies of target crypto
[100%] Linking C static library libcrypto.a
[100%] Built target crypto

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

@justsmth justsmth requested a review from torben-hansen May 15, 2023 15:06
@@ -11,6 +11,9 @@ fips_build_and_test -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1
if [[ ("$(uname -s)" == 'Linux'*) && (("$(uname -p)" == 'x86_64'*) || ("$(uname -p)" == 'aarch64'*)) ]]; then
echo "Testing AWS-LC static library in FIPS Release mode."
fips_build_and_test -DCMAKE_BUILD_TYPE=Release

# These build parameters may be needed by our aws-lc-fips-sys Rust package
run_build -DFIPS=1 -DBUILD_LIBSSL=OFF -DBUILD_TESTING=OFF
Copy link
Contributor

Choose a reason for hiding this comment

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

nice

@justsmth justsmth merged commit a7577d2 into aws:main May 15, 2023
@justsmth justsmth deleted the fix-modulewrapper branch May 15, 2023 17:04
justsmth added a commit to justsmth/aws-lc that referenced this pull request May 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants