Skip to content

Commit 8654637

Browse files
committed
Added a check for checking whether the linker support -map
1 parent 1d88c26 commit 8654637

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

configure.ac

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -177,20 +177,20 @@ AC_LANG_POP
177177
# AC_LINK_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_NO_UNUSED_ARGUMENT_WARNING+=" -Qunused-arguments" ], [AC_MSG_RESULT([no])])
178178
# LDFLAGS="$saved_ldflags"
179179

180-
#if [ -z "`$CXX --version | grep LLVM`" ]
181-
#then
182-
# AC_MSG_RESULT([no])
183-
#else
184-
# AC_MSG_RESULT([yes])
185-
#fi
186-
187180
AC_MSG_CHECKING([whether CXXLD supports -Qunused-arguments linker option])
188181
OUTPUT_WHEN_CLANG_COMPILER=`${CXX} --version | grep clang`
189182
AM_CONDITIONAL([TEST_COMPILER_IS_CLANG], [ ! test -z "$OUTPUT_WHEN_CLANG_COMPILER]")
190183
AM_COND_IF([TEST_COMPILER_IS_CLANG],
191184
[AC_MSG_RESULT([yes]); CPPUTEST_NO_UNUSED_ARGUMENT_WARNING+=" -Qunused-arguments"],
192185
[AC_MSG_RESULT([no])]; CPPUTEST_NO_UNUSED_ARGUMENT_WARNING+=" ")
193186

187+
# Checking for options for creating map files
188+
LDFLAGS=" -Wl,-map,$<.map.txt"
189+
AC_MSG_CHECKING([whether LD supports -Wl,-map])
190+
AC_LINK_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_LD_MAP_GENERATION+=" -Wl,-map,$<.map.txt" ], [AC_MSG_RESULT([no])])
191+
LDFLAGS="$saved_ldflags"
192+
193+
194194
# Different features
195195
AC_ARG_ENABLE([std-c], [AC_HELP_STRING([--disable-std-c], [disable the use of Standard C Library (warning: requires implementing Platforms/GccNoStdC) ])],
196196
[use_std_c=${enableval}], [use_std_c=yes])
@@ -257,7 +257,7 @@ fi
257257

258258
# Generating map files.
259259
if test "x${generate_map_file}" = xyes; then
260-
CPPUTEST_LDFLAGS+=" -Wl,-map,$<.map.txt"
260+
CPPUTEST_LDFLAGS+=$CPPUTEST_LD_MAP_GENERATION
261261
MOSTLYCLEANFILES+=" *.map.txt"
262262
fi
263263

0 commit comments

Comments
 (0)