@@ -177,20 +177,20 @@ AC_LANG_POP
177
177
# AC_LINK_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_NO_UNUSED_ARGUMENT_WARNING+=" -Qunused-arguments" ], [AC_MSG_RESULT([no])])
178
178
# LDFLAGS="$saved_ldflags"
179
179
180
- # if [ -z "`$CXX --version | grep LLVM`" ]
181
- # then
182
- # AC_MSG_RESULT([no])
183
- # else
184
- # AC_MSG_RESULT([yes])
185
- # fi
186
-
187
180
AC_MSG_CHECKING ( [ whether CXXLD supports -Qunused-arguments linker option] )
188
181
OUTPUT_WHEN_CLANG_COMPILER=`${CXX} --version | grep clang`
189
182
AM_CONDITIONAL([ TEST_COMPILER_IS_CLANG] , [ ! test -z "$OUTPUT_WHEN_CLANG_COMPILER] ")
190
183
AM_COND_IF([ TEST_COMPILER_IS_CLANG] ,
191
184
[ AC_MSG_RESULT ( [ yes] ) ; CPPUTEST_NO_UNUSED_ARGUMENT_WARNING+=" -Qunused-arguments"] ,
192
185
[ AC_MSG_RESULT ( [ no] ) ] ; CPPUTEST_NO_UNUSED_ARGUMENT_WARNING+=" ")
193
186
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
+
194
194
# Different features
195
195
AC_ARG_ENABLE ( [ std-c] , [ AC_HELP_STRING ([ --disable-std-c] , [ disable the use of Standard C Library (warning: requires implementing Platforms/GccNoStdC) ] )] ,
196
196
[ use_std_c=${enableval}] , [ use_std_c=yes] )
257
257
258
258
# Generating map files.
259
259
if test "x${generate_map_file}" = xyes; then
260
- CPPUTEST_LDFLAGS+=" -Wl,-map,$<.map.txt"
260
+ CPPUTEST_LDFLAGS+=$CPPUTEST_LD_MAP_GENERATION
261
261
MOSTLYCLEANFILES+=" *.map.txt"
262
262
fi
263
263
0 commit comments