diff options
| author | Oystein Eftevaag | 2006-10-21 20:41:49 +0000 |
|---|---|---|
| committer | Oystein Eftevaag | 2006-10-21 20:41:49 +0000 |
| commit | 7ca5752fbc6e54abcc1b2529edb5dbee71f4d22f (patch) | |
| tree | bd51984189d6bd8f81a2fa7c20f7d8f882767bed | |
| parent | 4913db71689a5c4077e54525471677a0ca3eda13 (diff) | |
| download | scummvm-rg350-7ca5752fbc6e54abcc1b2529edb5dbee71f4d22f.tar.gz scummvm-rg350-7ca5752fbc6e54abcc1b2529edb5dbee71f4d22f.tar.bz2 scummvm-rg350-7ca5752fbc6e54abcc1b2529edb5dbee71f4d22f.zip | |
Adding CXXFLAGS usage for various configure script tests, needed to properly crosscompile for OS X 10.2 on Intel Macs
svn-id: r24421
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | tools/module.mk | 4 |
2 files changed, 6 insertions, 6 deletions
@@ -110,7 +110,7 @@ cc_check() { echo >> "$TMPLOG" echo "$CXX $TMPC -o $TMPO$EXEEXT $@" >> "$TMPLOG" rm -f "$TMPO$EXEEXT" - ( $CXX "$TMPC" -o "$TMPO$EXEEXT" "$@" ) >> "$TMPLOG" 2>&1 + ( $CXX $CXXFLAGS "$TMPC" -o "$TMPO$EXEEXT" "$@" ) >> "$TMPLOG" 2>&1 TMP="$?" echo >> "$TMPLOG" return "$TMP" @@ -158,7 +158,7 @@ if test -n "$_host"; then # In cross-compiling mode, we cannot run the result eval "$1 -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp" 2> /dev/null && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp else - eval "$1 -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp" 2> /dev/null && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp + eval "$1 $CXXFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp" 2> /dev/null && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp fi } @@ -229,7 +229,7 @@ int main(int argc, char **argv) return 0; } EOF -if eval "$CXX -o tmp_find_type_with_size$EXEEXT tmp_find_type_with_size.cpp"; then +if eval "$CXX $CXXFLAGS -o tmp_find_type_with_size$EXEEXT tmp_find_type_with_size.cpp"; then datatype=`./tmp_find_type_with_size $1` if test "$datatype" = "unknown"; then echo "couldn't find data type with $1 bytes" @@ -805,7 +805,7 @@ int main(int argc, char **argv) return 0; } EOF - $CXX -o tmp_endianness_check$EXEEXT tmp_endianness_check.cpp + $CXX $CXXFLAGS -o tmp_endianness_check$EXEEXT tmp_endianness_check.cpp endianness=`./tmp_endianness_check` echo $endianness; case $endianness in diff --git a/tools/module.mk b/tools/module.mk index dd44b415bf..ec88fefc4e 100644 --- a/tools/module.mk +++ b/tools/module.mk @@ -27,11 +27,11 @@ clean-tools: tools/convbdf$(EXEEXT): $(srcdir)/tools/convbdf.c $(MKDIR) tools/$(DEPDIR) - $(CC) -Wall -o $@ $< + $(CC) $(CFLAGS) -Wall -o $@ $< tools/md5table$(EXEEXT): $(srcdir)/tools/md5table.c $(MKDIR) tools/$(DEPDIR) - $(CC) -Wall -o $@ $< + $(CC) $(CFLAGS) -Wall -o $@ $< # # Rules to explicitly rebuild the credits / MD5 tables. |