Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Sadov <vsadov@microsoft.com>2020-12-07 07:08:41 +0300
committerGitHub <noreply@github.com>2020-12-07 07:08:41 +0300
commit08ad8346087e1caac04d1ca61bfe0ce7fd5977ad (patch)
tree55f1106ed124c3673183510e91849c2f9e94736a /src/coreclr/build-runtime.sh
parenta5d0bcf19f778ac3cc579320c64adc4cf2e5f1d7 (diff)
Static linking of native libs (#44505)
* from prototype * fix OSX * fix for Android * treat "libSystem.Globalization.Native" as QCall in mono too (for now). * fix for wasm * fix pedantic errors on GCC * delete gPalGlobalizationNative * pass overrider from the host * default override * default PInvoke override runs after optional host-provided overrider. * Some PR feedback (mostly related to code, not the CMake stuff). * more coding PR feedback * Deleted "libraries-native" folder. * unifying tryrun.cmake into 1 common file * factor out adding lib-specific dependencies into one place (per native library) * cleanup: entirely remove tryrun.cmake propagation in eng, gen-buildsys, build-commons, and build scripts * remove "clrcompression.dll" and "libSystem.IO.Compression.Native.dylib" from single-file host packaging * mono: refactor Globalization lookup into `default_resolve_dllimport`. * set FEATURE_DISTRO_AGNOSTIC_SSL according to __PortableBuild * CORECLR_CALLING_CONVENTION for the host callback types * refactor common parts of entrypoints.c into entrypoints.h * rename OverrideEntry --> DllImportEntry * extra libs as CMake functions * use macros instead of functions in extra_libs.cmake * mono formatting style in src/mono/mono/metadata/native-library.c Co-authored-by: Ryan Lucia <ryan@luciaonline.net> * mono: Remaining stylistic nits. Co-authored-by: Ryan Lucia <ryan@luciaonline.net> * do not set DFEATURE_DISTRO_AGNOSTIC_SSL on iOS, Android, tvOS Co-authored-by: Ryan Lucia <ryan@luciaonline.net>
Diffstat (limited to 'src/coreclr/build-runtime.sh')
-rwxr-xr-xsrc/coreclr/build-runtime.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/coreclr/build-runtime.sh b/src/coreclr/build-runtime.sh
index 91c0b445c75..f8129a719a3 100755
--- a/src/coreclr/build-runtime.sh
+++ b/src/coreclr/build-runtime.sh
@@ -99,7 +99,7 @@ build_cross_architecture_components()
export __CMakeBinDir CROSSCOMPILE
__CMakeArgs="-DCLR_CMAKE_TARGET_ARCH=$__BuildArch -DCLR_CROSS_COMPONENTS_BUILD=1 $__CMakeArgs"
- build_native "$__TargetOS" "$__CrossArch" "$__ProjectRoot" "$__ProjectRoot" "$intermediatesForBuild" "$__CMakeArgs" "cross-architecture components"
+ build_native "$__TargetOS" "$__CrossArch" "$__ProjectRoot" "$intermediatesForBuild" "$__CMakeArgs" "cross-architecture components"
CROSSCOMPILE=1
export CROSSCOMPILE
@@ -257,7 +257,7 @@ fi
if [[ "$__SkipNative" == 1 ]]; then
echo "Skipping CoreCLR component build."
else
- build_native "$__TargetOS" "$__BuildArch" "$__ProjectRoot" "$__ProjectRoot" "$__IntermediatesDir" "$__CMakeArgs" "CoreCLR component"
+ build_native "$__TargetOS" "$__BuildArch" "$__ProjectRoot" "$__IntermediatesDir" "$__CMakeArgs" "CoreCLR component"
# Build cross-architecture components
if [[ "$__SkipCrossArchNative" != 1 ]]; then