summaryrefslogtreecommitdiffstats
path: root/source/x/x11
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/x11')
-rw-r--r--source/x/x11/arch.use.flags10
-rw-r--r--source/x/x11/configure/pixman3
2 files changed, 8 insertions, 5 deletions
diff --git a/source/x/x11/arch.use.flags b/source/x/x11/arch.use.flags
index eb8fbb71f..0e30c3eeb 100644
--- a/source/x/x11/arch.use.flags
+++ b/source/x/x11/arch.use.flags
@@ -1,11 +1,11 @@
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fcommon"
elif [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon"
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fcommon"
elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
+ SLKCFLAGS="-O2 -fcommon"
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
+ SLKCFLAGS="-O2 -fPIC -fcommon"
fi
diff --git a/source/x/x11/configure/pixman b/source/x/x11/configure/pixman
index 492cf8ae0..52cb86c34 100644
--- a/source/x/x11/configure/pixman
+++ b/source/x/x11/configure/pixman
@@ -1,3 +1,6 @@
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
if [ "$ARCH" = "x86_64" ]; then
do_sse2="--enable-sse2"
else