RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-01-13 08:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

libselinux,libsemanage: never create -.o in exception.sh

Browse Source 
Files starting with "-" causes issues in commands such as "rm *.o". For
libselinux and libsemanage, when exception.sh fails to remove "-.o",
"make clean" fails with:

    rm: invalid option -- '.'
    Try 'rm ./-.o' to remove the file '-.o'.
    Try 'rm --help' for more information.

Fix this by making exception.sh create "temp.o" instead of "-.o".

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
This commit is contained in:
Nicolas Iooss 2019-11-11 10:49:37 +01:00
parent 8375671d30
commit 5815cc9843
No known key found for this signature in database
GPG Key ID: C191415F340DAAA0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libselinux/src/exception.sh
View File

@ -15,10 +15,10 @@ echo "
;;
esac
}
if ! ${CC:-gcc} -x c -c -I../include - -aux-info temp.aux < ../include/selinux/selinux.h
if ! ${CC:-gcc} -x c -c -I../include -o temp.o - -aux-info temp.aux < ../include/selinux/selinux.h
then
# clang does not support -aux-info so fall back to gcc
gcc -x c -c -I../include - -aux-info temp.aux < ../include/selinux/selinux.h
gcc -x c -c -I../include -o temp.o - -aux-info temp.aux < ../include/selinux/selinux.h
fi
for i in `awk '/<stdin>.*extern int/ { print $6 }' temp.aux`; do except $i ; done
rm -f -- temp.aux -.o
rm -f -- temp.aux temp.o

6
libsemanage/src/exception.sh
View File

@ -9,10 +9,10 @@ echo "
}
"
}
if ! ${CC:-gcc} -x c -c -I../include - -aux-info temp.aux < ../include/semanage/semanage.h
if ! ${CC:-gcc} -x c -c -I../include -o temp.o - -aux-info temp.aux < ../include/semanage/semanage.h
then
# clang does not support -aux-info so fall back to gcc
gcc -x c -c -I../include - -aux-info temp.aux < ../include/semanage/semanage.h
gcc -x c -c -I../include -o temp.o - -aux-info temp.aux < ../include/semanage/semanage.h
fi
for i in `awk '/extern int/ { print $6 }' temp.aux`; do except $i ; done
rm -f -- temp.aux -.o
rm -f -- temp.aux temp.o