Skip to content

Commit 6eedf8e

Browse files
authored
Remove -stripsymbols option from build scripts (#34076)
Symbol stripping is on by default in cmake scripts. This cleans up the remaining places where the no-op `-stripsymbols` option is passed from shell scripts via `.proj` files. Fixes #32957
1 parent c64210e commit 6eedf8e

File tree

7 files changed

+1
-15
lines changed

7 files changed

+1
-15
lines changed

eng/build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,6 @@ while [[ $# > 0 ]]; do
151151
arguments="$arguments /p:Coverage=true"
152152
shift 1
153153
;;
154-
-stripsymbols)
155-
arguments="$arguments /p:BuildNativeStripSymbols=true"
156-
shift 1
157-
;;
158154
-runtimeconfiguration)
159155
val="$(tr '[:lower:]' '[:upper:]' <<< ${2:0:1})${2:1}"
160156
arguments="$arguments /p:RuntimeConfiguration=$val"

eng/native/build-commons.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ usage()
187187
echo "-portablebuild: pass -portablebuild=false to force a non-portable build."
188188
echo "-skipconfigure: skip build configuration."
189189
echo "-skipgenerateversion: disable version generation even if MSBuild is supported."
190-
echo "-stripsymbols: skip native image generation."
191190
echo "-verbose: optional argument to enable verbose build output."
192191
echo ""
193192
echo "Additional Options:"
@@ -336,9 +335,6 @@ while :; do
336335
__SkipGenerateVersion=1
337336
;;
338337

339-
stripsymbols|-stripsymbols)
340-
;;
341-
342338
verbose|-verbose)
343339
__VerboseBuild=1
344340
;;

eng/pipelines/installer/jobs/base-job.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ jobs:
123123
value: >-
124124
$(Build.SourcesDirectory)/installer.sh --restore --build --ci --test
125125
-configuration $(_BuildConfig)
126-
/p:StripSymbols=true
127126
$(LiveOverridePathArgs)
128127
$(CommonMSBuildArgs)
129128
$(OfficialBuildArg)
@@ -192,7 +191,6 @@ jobs:
192191
$(LiveOverridePathArgs)
193192
$(CommonMSBuildArgs)
194193
$(OutputRidArg)
195-
/p:StripSymbols=true
196194
197195
- name: PublishArguments
198196
value: >-

src/coreclr/runtime.proj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<_CoreClrBuildArg Condition="'$(ContinuousIntegrationBuild)' == 'true'" Include="-ci" />
1212
<_CoreClrBuildArg Condition="'$(CrossBuild)' == 'true'" Include="-cross" />
1313
<_CoreClrBuildArg Condition="$([MSBuild]::IsOsPlatform(Windows)) and ('$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'x64') and '$(Configuration)' == 'Release'" Include="-enforcepgo" />
14-
<_CoreClrBuildArg Condition="!$([MSBuild]::IsOsPlatform(Windows)) and '$(Configuration)' == 'Release'" Include="-stripsymbols" />
1514
<_CoreClrBuildArg Condition="$([MSBuild]::IsOsPlatform(Windows)) and '$(CrossDac)' != ''" Include="-$(CrossDac)dac" />
1615
<_CoreClrBuildArg Condition="'$(OfficialBuildId)' != ''" Include="/p:OfficialBuildId=$(OfficialBuildId)" />
1716
</ItemGroup>

src/installer/corehost/build.proj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<BuildArgs Condition="'$(CrossBuild)' == 'true'">$(BuildArgs) -cross</BuildArgs>
3333
<BuildArgs Condition="'$(Compiler)' != ''">$(BuildArgs) $(Compiler)</BuildArgs>
3434
<BuildArgs Condition="'$(CMakeArgs)' != ''">$(BuildArgs) $(CMakeArgs)</BuildArgs>
35-
<BuildArgs Condition="'$(StripSymbols)' == 'true'">$(BuildArgs) -stripsymbols</BuildArgs>
3635
</PropertyGroup>
3736

3837
<!--

src/libraries/Native/build-native.proj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
then we should consider calling Environment.ProcessorCount
2121
-->
2222
<_ProcessorCountArg> -numproc $(MSBuildNodeCount)</_ProcessorCountArg>
23-
<_StripSymbolsArg Condition="'$(BuildNativeStripSymbols)' == 'true' and '$(TargetOS)' != 'WebAssembly' and '$(TargetOS)' != 'iOS'"> -stripsymbols</_StripSymbolsArg>
2423
<_PortableBuildArg Condition="'$(PortableBuild)' != 'true'"> -portablebuild=false</_PortableBuildArg>
2524
<_CrossBuildArg Condition="'$(CrossBuild)' == 'true'"> -cross</_CrossBuildArg>
2625
<_CMakeArgs Condition="'$(CMakeArgs)' != ''"> $(CMakeArgs)</_CMakeArgs>
@@ -30,7 +29,7 @@
3029
used to force a specific compiler toolset.
3130
-->
3231
<_BuildNativeCompilerArg Condition="'$(BuildNativeCompiler)' != ''"> $(BuildNativeCompiler)</_BuildNativeCompilerArg>
33-
<_BuildNativeUnixArgs>$(_BuildNativeArgs)$(_ProcessCountArg)$(_StripSymbolsArg)$(_PortableBuildArg)$(_CrossBuildArg)$(_BuildNativeCompilerArg)$(_CMakeArgs) $(Compiler)</_BuildNativeUnixArgs>
32+
<_BuildNativeUnixArgs>$(_BuildNativeArgs)$(_ProcessCountArg)$(_PortableBuildArg)$(_CrossBuildArg)$(_BuildNativeCompilerArg)$(_CMakeArgs) $(Compiler)</_BuildNativeUnixArgs>
3433
</PropertyGroup>
3534

3635
<Message Text="$(MSBuildProjectDirectory)/build-native.sh $(_BuildNativeUnixArgs)" Importance="High"/>

tools-local/scripts/dev/master-build-deb-rpm-docker.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ package() {
9696
./build.sh \
9797
-c Release \
9898
/p:PortableBuild=true \
99-
/p:StripSymbols=true \
10099
/p:TargetArchitecture=x64 \
101100
/bl:artifacts/msbuild.portable.binlog
102101

0 commit comments

Comments
 (0)