Reverting x86 build related fixes to focus only on the memory leaks

dotnet · Dec 1, 2020 · f7ddf9f · f7ddf9f
1 parent 4b74271
commit f7ddf9f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -12,9 +12,7 @@
 		<TargetArchitecture Condition="'$(Platform)' == ''">x64</TargetArchitecture>
 		<NativeTargetArchitecture Condition="'$(NativeTargetArchitecture)' == ''">$(TargetArchitecture)</NativeTargetArchitecture>
 		<BinDir Condition="'$(BinDir)'==''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin'))</BinDir>
-		<NativeOutputConfig Condition="$(Configuration.Contains('Debug'))">Debug</NativeOutputConfig>
-		<NativeOutputConfig Condition="$(Configuration.Contains('Release'))">Release</NativeOutputConfig>
-		<NativeOutputPath>$(BinDir)Native\$(NativeTargetArchitecture).$(NativeOutputConfig)\</NativeOutputPath>
+		<NativeOutputPath>$(BinDir)Native\$(NativeTargetArchitecture).$(Configuration)\</NativeOutputPath>
 
 		<Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
 		<PlatformConfig>$(Platform).$(Configuration)</PlatformConfig>

diff --git a/src/Native/build.sh b/src/Native/build.sh
@@ -63,9 +63,6 @@ while [ "$1" != "" ]; do
     shift
 done
 
-# strip the -netcoreapp3_1 and -netfx suffixes from the configuration
-__configuration=${__configuration/-netcoreapp3_1/}
-__configuration=${__configuration/-netfx/}
 __cmake_defines="-DCMAKE_BUILD_TYPE=${__configuration} ${__strip_argument} -DMKL_LIB_PATH=${__mkllibpath} -DMKL_LIB_RPATH=${__mkllibrpath}"
 
 __IntermediatesDir="$__baseIntermediateOutputPath/Native/$__build_arch.$__configuration"