suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: propagate CPP, LD, CPPFLAGS, LDFLAGS for --enable-sdk build

Browse Source
This commit is contained in:
Matthew Flatt 2014-03-09 17:03:18 -06:00
parent a98582b823
commit 4476e36705
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
racket/src/configure vendored
View File

@ -4561,11 +4561,15 @@ $as_echo "#define HAVE_STDINT_H 1" >>confdefs.h
fi fi
if test "${CPP}" = "gcc -E" ; then if test "${CPP}" = "gcc -E" ; then
CPP="gcc-4.0 -E" CPP="gcc-4.0 -E"
need_cpp_in_extras=yes
fi fi
if test "${LD}" = "gcc" ; then if test "${LD}" = "gcc" ; then
LD=gcc-4.0 LD=gcc-4.0
need_ld_in_extras=yes
fi fi
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"' SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPPFLAGS="'"'"${PREFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LDFLAGS="'"'"${LDFLAGS}"'"'
need_cc_in_extras=yes need_cc_in_extras=yes
if test "$ORIG_CC_FOR_BUILD" = "" ; then if test "$ORIG_CC_FOR_BUILD" = "" ; then
CC_FOR_BUILD="$CC" CC_FOR_BUILD="$CC"
@ -4575,7 +4579,9 @@ $as_echo "#define HAVE_STDINT_H 1" >>confdefs.h
if test "${enable_sdk6}" != "" ; then if test "${enable_sdk6}" != "" ; then
PREFLAGS="$PREFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6" PREFLAGS="$PREFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6"
LDFLAGS="$LDFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6" LDFLAGS="$LDFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6"
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"' SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPPFLAGS="'"'"${PREFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LDFLAGS="'"'"${LDFLAGS}"'"'
fi fi
case "$host_cpu" in case "$host_cpu" in
@ -4609,6 +4615,12 @@ $as_echo "#define HAVE_STDINT_H 1" >>confdefs.h
if test "${need_cc_in_extras}" = "yes" ; then if test "${need_cc_in_extras}" = "yes" ; then
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"'"' SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"'"'
fi fi
if test "${need_cpp_in_extras}" = "yes" ; then
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPP="'"'"${CPP}"'"'
fi
if test "${need_ld_in_extras}" = "yes" ; then
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LD="'"'"${LD}"'"'
fi
if test "${enable_quartz}" = "yes" ; then if test "${enable_quartz}" = "yes" ; then
WXVARIANT="wx_mac" WXVARIANT="wx_mac"

16
racket/src/racket/configure.ac
View File

@ -713,11 +713,15 @@ case "$host_os" in
fi fi
if test "${CPP}" = "gcc -E" ; then if test "${CPP}" = "gcc -E" ; then
CPP="gcc-4.0 -E" CPP="gcc-4.0 -E"
need_cpp_in_extras=yes
fi fi
if test "${LD}" = "gcc" ; then if test "${LD}" = "gcc" ; then
LD=gcc-4.0 LD=gcc-4.0
need_ld_in_extras=yes
fi fi
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"' SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPPFLAGS="'"'"${PREFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LDFLAGS="'"'"${LDFLAGS}"'"'
need_cc_in_extras=yes need_cc_in_extras=yes
if test "$ORIG_CC_FOR_BUILD" = "" ; then if test "$ORIG_CC_FOR_BUILD" = "" ; then
CC_FOR_BUILD="$CC" CC_FOR_BUILD="$CC"
@ -727,7 +731,9 @@ case "$host_os" in
if test "${enable_sdk6}" != "" ; then if test "${enable_sdk6}" != "" ; then
PREFLAGS="$PREFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6" PREFLAGS="$PREFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6"
LDFLAGS="$LDFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6" LDFLAGS="$LDFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6"
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"' SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPPFLAGS="'"'"${PREFLAGS}"'"'
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LDFLAGS="'"'"${LDFLAGS}"'"'
fi fi
case "$host_cpu" in case "$host_cpu" in
@ -761,6 +767,12 @@ case "$host_os" in
if test "${need_cc_in_extras}" = "yes" ; then if test "${need_cc_in_extras}" = "yes" ; then
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"'"' SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"'"'
fi fi
if test "${need_cpp_in_extras}" = "yes" ; then
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPP="'"'"${CPP}"'"'
fi
if test "${need_ld_in_extras}" = "yes" ; then
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LD="'"'"${LD}"'"'
fi
if test "${enable_quartz}" = "yes" ; then if test "${enable_quartz}" = "yes" ; then
WXVARIANT="wx_mac" WXVARIANT="wx_mac"