diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 18:56:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 18:56:10 -0400 |
commit | d43b7167d4c74137f9a6c61fdcead127d60357f9 (patch) | |
tree | 21661650720837e3f5ed8f8c5ded4c9b91a10e83 /scripts/kconfig | |
parent | 80b810b276cf89587cdaa103e39027813b1be46c (diff) | |
parent | b1e0d8b70fa31821ebca3965f2ef8619d7c5e316 (diff) |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild fixes from Michal Marek:
"Here are two fixes I intended to send after v3.6-rc7, but failed to do
so. So please pull them for v3.7-rc1 and they will be picked up by
stable.
The first one fixes gcc -x <language> syntax in various build-time
tests, which icecream and possible other gcc wrappers did not
understand (and yes, icecream is going to be fixed as well).
The second one fixes make tar-pkg so that unpacking the tarball does
not replace the /lib -> /usr/lib symlink on recent Fedora releases."
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild: Fix gcc -x syntax
kbuild: Do not package /boot and /lib in make tar-pkg
Diffstat (limited to 'scripts/kconfig')
-rwxr-xr-x | scripts/kconfig/check.sh | 2 | ||||
-rw-r--r-- | scripts/kconfig/lxdialog/check-lxdialog.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/check.sh b/scripts/kconfig/check.sh index fa59cbf9d62c..854d9c7c675c 100755 --- a/scripts/kconfig/check.sh +++ b/scripts/kconfig/check.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # Needed for systems without gettext | 2 | # Needed for systems without gettext |
3 | $* -xc -o /dev/null - > /dev/null 2>&1 << EOF | 3 | $* -x c -o /dev/null - > /dev/null 2>&1 << EOF |
4 | #include <libintl.h> | 4 | #include <libintl.h> |
5 | int main() | 5 | int main() |
6 | { | 6 | { |
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh index e3b12c010417..c8e8a7154753 100644 --- a/scripts/kconfig/lxdialog/check-lxdialog.sh +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh | |||
@@ -38,7 +38,7 @@ trap "rm -f $tmp" 0 1 2 3 15 | |||
38 | 38 | ||
39 | # Check if we can link to ncurses | 39 | # Check if we can link to ncurses |
40 | check() { | 40 | check() { |
41 | $cc -xc - -o $tmp 2>/dev/null <<'EOF' | 41 | $cc -x c - -o $tmp 2>/dev/null <<'EOF' |
42 | #include CURSES_LOC | 42 | #include CURSES_LOC |
43 | main() {} | 43 | main() {} |
44 | EOF | 44 | EOF |