Skip to content

Commit 77ed199

Browse files
committed
build: make.probe: don't probe optimizer flag if passed in CCFLAGS
If an -O* flag is already passed in CCFLAGS, don't probe for a default optimizer flag; this avoids having a redundant -Os or -O in the logs.
1 parent 9fc2509 commit 77ed199

1 file changed

Lines changed: 14 additions & 12 deletions

File tree

src/cmd/INIT/make.probe

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Glenn Fowler
44
# AT&T Research
55
#
6-
# @(#)make.probe (ksh 93u+m) 2024-08-13
6+
# @(#)make.probe (ksh 93u+m) 2026-03-11
77
#
88
# C probe for make
99
#
@@ -18,8 +18,6 @@ probe_ccs="strip size nm ld ar" # longest to shortest
1818
probe_debug="-g"
1919
probe_dll="'-G 0' -Wc,dll,exportall,longname,rent -Wc,exportall -dynamic $cc_dll_def"
2020
probe_export_dynamic="-rdynamic -export-dynamic -Wl,-export-dynamic -Wl,-E -bexpall -force_flat_namespace"
21-
probe_gcc_optimize="-Os"
22-
probe_gcc_version="*[Gg][Cc][Cc]*"
2321
probe_include_local="'-ignore-source-dir -iquote' -iquote -I-"
2422
probe_ldasneeded="-Wl,-as-needed -Wl,-no-as-needed"
2523
probe_ldlazy='-zlazyload -znolazyload -Wl,-zlazyload -Wl,-znolazyload'
@@ -1454,16 +1452,20 @@ then e=`wc -c < e`
14541452
esac
14551453
done
14561454

1457-
case $version_string in
1458-
$probe_gcc_version) probe_optimize="$probe_gcc_optimize $probe_optimize" ;;
1455+
# don't bother probing optimization flags if some were passed in CCFLAGS
1456+
case $CCFLAGS in
1457+
-O* | *\ -O*)
1458+
;;
1459+
*)
1460+
for i in $probe_optimize
1461+
do rm -f warn.$obj
1462+
$cc $i -c warn.$src 2>e && test -f warn.$obj || continue
1463+
case `wc -c < e` in
1464+
$e) optimize=$i; break ;;
1465+
esac
1466+
done
1467+
;;
14591468
esac
1460-
for i in $probe_optimize
1461-
do rm -f warn.$obj
1462-
$cc $i -c warn.$src 2>e && test -f warn.$obj || continue
1463-
case `wc -c < e` in
1464-
$e) optimize=$i; break ;;
1465-
esac
1466-
done
14671469

14681470
eval set x $probe_strict
14691471
while :

0 commit comments

Comments
 (0)