mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-13 19:52:20 +00:00
Skip adding -nostartfiles flag during compilation
Due to a recent change in gcc, compilation breaks on Fedora rawhide. This should be fixed by skipping -nostartfiles flag. Resolves: rhbz#1540796 Related: rhbz#1540642
This commit is contained in:
parent
51670c7601
commit
683bccf3ba
1 changed files with 0 additions and 32 deletions
|
@ -40,7 +40,6 @@ probe_no_protect="'-fno-stack-protector -fno-stack-protector-all' -GS-"
|
||||||
probe_readonly="-R -Krodata -xMerge -Wa,-r"
|
probe_readonly="-R -Krodata -xMerge -Wa,-r"
|
||||||
probe_shared="'' -G -b -c -shared -Wl,dll"
|
probe_shared="'' -G -b -c -shared -Wl,dll"
|
||||||
probe_shared_name="-Wl,-soname= -h"
|
probe_shared_name="-Wl,-soname= -h"
|
||||||
probe_shared_nostart="-nostartfiles"
|
|
||||||
probe_shared_registry='"-update_registry $probe_shared_registry_file"'
|
probe_shared_registry='"-update_registry $probe_shared_registry_file"'
|
||||||
probe_shared_registry_file='registry.ld'
|
probe_shared_registry_file='registry.ld'
|
||||||
probe_shared_registry_path="\$(LIBDIR)/$probe_shared_registry_file"
|
probe_shared_registry_path="\$(LIBDIR)/$probe_shared_registry_file"
|
||||||
|
@ -709,37 +708,6 @@ case $cc_dll:$cc_pic:$so:$dynamic:$static in
|
||||||
esac
|
esac
|
||||||
dld=$xx
|
dld=$xx
|
||||||
shared=$1
|
shared=$1
|
||||||
# does -nostartfiles make sense for C?
|
|
||||||
case $plusplus in
|
|
||||||
'') z=`wc -c < xxx$dll`
|
|
||||||
eval set x $probe_shared_nostart
|
|
||||||
while :
|
|
||||||
do shift
|
|
||||||
case $# in
|
|
||||||
0) break ;;
|
|
||||||
esac
|
|
||||||
rm -f xxx$dll
|
|
||||||
if $dld $shared $1 -o xxx$dll shared.$obj 2>e && test -r xxx$dll
|
|
||||||
then case `wc -c < xxx$dll` in
|
|
||||||
$z) ;;
|
|
||||||
*) if test -s e
|
|
||||||
then case `cat e` in
|
|
||||||
*[Ee][Rr][Rr][Oo][Rr]*|*[Ww][Aa][Rr][Nn][Ii][Nn][Gg]*|*[Oo][Pp][Tt][Ii][Oo][Nn]*)
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
case $shared in
|
|
||||||
'') shared=$1 ;;
|
|
||||||
*) shared="$shared $1" ;;
|
|
||||||
esac
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case $cc_dll in
|
case $cc_dll in
|
||||||
"") cc_dll=$cc_dll_def ;;
|
"") cc_dll=$cc_dll_def ;;
|
||||||
esac
|
esac
|
||||||
|
|
Loading…
Reference in a new issue