summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-23 10:02:21 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-23 10:02:21 +0000
commitcd48432d6c637af933ce0898e2ae450aaf853504 (patch)
tree0450e75b18c3cede75cd41685546f125fab4b7bd
parent2bf63bb4840102768a5799b668d0f61fade984aa (diff)
downloadmpv-cd48432d6c637af933ce0898e2ae450aaf853504.tar.bz2
mpv-cd48432d6c637af933ce0898e2ae450aaf853504.tar.xz
Remove -fno-PIC check from configure and put -fPIC back at the beginning
of CFLAGS in libdha/ and vidix/drivers/. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20404 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure15
-rw-r--r--libdha/Makefile2
-rw-r--r--vidix/drivers/Makefile2
3 files changed, 2 insertions, 17 deletions
diff --git a/configure b/configure
index 8c2be3783f..00c3bbc2a3 100755
--- a/configure
+++ b/configure
@@ -7225,21 +7225,6 @@ if test "$_largefiles" = yes || freebsd ; then
fi
fi
-echocheck "compiler support for -fno-PIC"
-if x86; then
-cat > $TMPC <<EOF
-int main(void) { return 0; }
-EOF
-if cc_check -fno-PIC ; then
- CFLAGS="-fno-PIC $CFLAGS"
- echores "yes"
-else
- echores "no"
-fi
-else
- echores "only used for x86"
-fi
-
echocheck "compiler support for noexecstack"
cat > $TMPC <<EOF
int main(void) { return 0; }
diff --git a/libdha/Makefile b/libdha/Makefile
index 91bdbc8d2f..ad7e1f9be9 100644
--- a/libdha/Makefile
+++ b/libdha/Makefile
@@ -29,7 +29,7 @@ SRCS=libdha.c \
OBJS=$(SRCS:.c=.o)
-CFLAGS = -I. -I.. $(OPTFLAGS) -fPIC
+CFLAGS = -fPIC -I. -I.. $(OPTFLAGS)
ifeq ($(TARGET_OS),OpenBSD)
ifeq ($(TARGET_ARCH_X86),yes)
diff --git a/vidix/drivers/Makefile b/vidix/drivers/Makefile
index 1561f7216d..831587b071 100644
--- a/vidix/drivers/Makefile
+++ b/vidix/drivers/Makefile
@@ -6,7 +6,7 @@ BINDIR = $(LIBDIR)/mplayer/vidix
VIDIX_LIBS = -L../../libdha -ldha
VIDIX_LIBS_M = $(VIDIX_LIBS) -lm
VIDIX_LIBS_X = $(VIDIX_LIBS_M) $(X_LIB)
-VIDIX_CFLAGS= -I. -I.. $(OPTFLAGS) -fPIC
+VIDIX_CFLAGS = -fPIC -I. -I.. $(OPTFLAGS)
RAGE128_CFLAGS=$(VIDIX_CFLAGS) -DRAGE128
MGA_CRTC2_CFLAGS=$(VIDIX_CFLAGS) -DCRTC2