Skip to content

Commit b3b0bc9

Browse files
mstorsjolu-zero
authored andcommitted
Don't forcible use -fPIC, check whether it's supported in configure
While gcc just warns about -fPIC when targeting mingw, clang throws an error.
1 parent 92c729c commit b3b0bc9

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

Makefile.am

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ libmfx_la_LDFLAGS = -no-undefined -static-libgcc -static-libstdc++
4545
libmfx_la_LDFLAGS += -version-info $(MFX_LT_CURRENT):$(MFX_LT_REVISION):$(MFX_LT_AGE)
4646
libmfx_la_LIBADD = $(DLLIB) $(LIBVA_DRM_LIBS) $(LIBVA_X11_LIBS)
4747
libmfx_la_CPPFLAGS = $(LIBVA_DRM_CFLAGS) $(LIBVA_X11_CFLAGS) $(AM_CPPFLAGS)
48-
libmfx_la_CXXFLAGS = $(AM_CXXFLAGS) -fPIC
49-
libmfx_la_CFLAGS = $(AM_CFLAGS) -fPIC
5048

5149
pkgconfigdir = $(libdir)/pkgconfig
5250
pkgconfig_DATA = libmfx.pc

configure.ac

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,17 @@ AC_SUBST(DLLIB)
3434

3535
AC_PROG_CXX
3636

37+
AC_MSG_CHECKING(whether fPIC compiler option is accepted)
38+
SAVED_CXXFLAGS="$CXXFLAGS"
39+
CXXFLAGS="$CXXFLAGS -fPIC -Werror"
40+
AC_LANG_PUSH(C++)
41+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
42+
[AC_MSG_RESULT(yes)
43+
CXXFLAGS="$SAVED_CXXFLAGS -fPIC"],
44+
[AC_MSG_RESULT(no)
45+
CXXFLAGS="$SAVED_CXXFLAGS"])
46+
AC_LANG_POP(C++)
47+
3748
LT_INIT([disable-shared])
3849

3950
AC_CONFIG_MACRO_DIR([m4])

0 commit comments

Comments
 (0)