Skip to content

Commit

Permalink
configure: commit test files
Browse files Browse the repository at this point in the history
These are currently auto-generated, but meson needs the same files, so
lets commit them to reduce duplication.

v3: - Rename .build to build-support

Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Signed-off-by: Dylan Baker <[email protected]>
  • Loading branch information
dcbaker committed Oct 16, 2017
1 parent 3b209e9 commit e4796ab
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 17 deletions.
4 changes: 3 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ EXTRA_DIST = \
doxygen \
bin/git_sha1_gen.py \
scons \
SConstruct
SConstruct \
build-support/conftest.dyn \
build-support/conftest.map

noinst_HEADERS = \
include/c99_alloca.h \
Expand Down
3 changes: 3 additions & 0 deletions build-support/conftest.dyn
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
radeon_drm_winsys_create;
};
6 changes: 6 additions & 0 deletions build-support/conftest.map
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
VERSION_1 {
global:
main;
local:
*;
};
18 changes: 2 additions & 16 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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=$srcdir/build-support/conftest.map"
AC_LINK_IFELSE(
[AC_LANG_SOURCE([int main() { return 0;}])],
[have_ld_version_script=yes;AC_MSG_RESULT(yes)],
Expand All @@ -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=$srcdir/build-support/conftest.dyn"
AC_LINK_IFELSE(
[AC_LANG_SOURCE([int main() { return 0;}])],
[have_ld_dynamic_list=yes;AC_MSG_RESULT(yes)],
Expand Down

0 comments on commit e4796ab

Please sign in to comment.