These are currently auto-generated, but meson needs the same files, so
lets commit them to reduce duplication.
Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
---
.build/conftest.dyn | 3 +++
.build/conftest.map | 6 ++++++
Makefile.am | 4 +++-
configure.ac | 18 ++----------------
4 files changed, 14 insertions(+), 17 deletions(-)
create mode 100644 .build/conftest.dyn
create mode 100644 .build/conftest.map
diff --git a/.build/conftest.dyn b/.build/conftest.dyn
new file mode 100644
index 00000000000..8d243dc0a79
--- /dev/null
+++ b/.build/conftest.dyn
@@ -0,0 +1,3 @@
+{
+ radeon_drm_winsys_create;
+};
diff --git a/.build/conftest.map b/.build/conftest.map
new file mode 100644
index 00000000000..7d8590ff357
--- /dev/null
+++ b/.build/conftest.map
@@ -0,0 +1,6 @@
+VERSION_1 {
+ global:
+ main;
+ local:
+ *;
+};
diff --git a/Makefile.am b/Makefile.am
index a4f49d3d332..71b03acb2ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,7 +56,9 @@ EXTRA_DIST = \
doxygen \
bin/git_sha1_gen.py \
scons \
- SConstruct
+ SConstruct \
+ .build/conftest.dyn \
+ .build/conftest.map
noinst_HEADERS = \
include/c99_alloca.h \
diff --git a/configure.ac b/configure.ac
index 477ea516a2b..7c7a3b6f930 100644
--- a/configure.ac
+++ b/configure.ac
@@ -606,16 +606,7 @@ dnl Check if linker supports version scripts
dnl
AC_MSG_CHECKING([if the linker supports version-scripts])
save_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
-cat > conftest.map <<EOF
-VERSION_1 {
- global:
- main;
-
- local:
- *;
-};
-EOF
+LDFLAGS="$LDFLAGS -Wl,--version-script=.build/conftest.map"
AC_LINK_IFELSE(
[AC_LANG_SOURCE([int main() { return 0;}])],
[have_ld_version_script=yes;AC_MSG_RESULT(yes)],
@@ -628,12 +619,7 @@ dnl Check if linker supports dynamic list files
dnl
AC_MSG_CHECKING([if the linker supports --dynamic-list])
save_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -Wl,--dynamic-list=conftest.dyn"
-cat > conftest.dyn <<EOF
-{
- radeon_drm_winsys_create;
-};
-EOF
+LDFLAGS="$LDFLAGS -Wl,--dynamic-list=.build/conftest.dyn"
AC_LINK_IFELSE(
[AC_LANG_SOURCE([int main() { return 0;}])],
[have_ld_dynamic_list=yes;AC_MSG_RESULT(yes)],
--
2.14.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
