diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-24 10:06:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-24 10:06:37 (GMT) |
| commit | 3ae5ed3dfcf3397abdbec6a00fae11fccd5fcc15 (patch) | |
| tree | feafd2e878c370cb215aa7a02753ad401be58346 | |
| parent | 89890a88e601c3fead67d7c05822cc3fec206835 (diff) | |
| parent | 2d00a8c17ed3d5c994cd8dbb03df2d0ca841370e (diff) | |
| download | tcl-3ae5ed3dfcf3397abdbec6a00fae11fccd5fcc15.zip tcl-3ae5ed3dfcf3397abdbec6a00fae11fccd5fcc15.tar.gz tcl-3ae5ed3dfcf3397abdbec6a00fae11fccd5fcc15.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | win/Makefile.in | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index c7062e8..b98a415 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -277,8 +277,8 @@ VALGRINDARGS = --tool=memcheck --num-callers=24 \ # modify it and you shouldn't need to modify it either. #-------------------------------------------------------------------------- -STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ - -I"${BUILD_DIR}" -I${UNIX_DIR} -I${GENERIC_DIR} -I${TOMMATH_DIR} \ +STUB_CC_SWITCHES = -I"${BUILD_DIR}" -I${UNIX_DIR} -I${GENERIC_DIR} -I${TOMMATH_DIR} \ + ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ ${AC_FLAGS} ${PROTO_FLAGS} ${ENV_FLAGS} ${EXTRA_CFLAGS} \ @EXTRA_CC_SWITCHES@ diff --git a/win/Makefile.in b/win/Makefile.in index 8c2a241..dc3facf 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -249,9 +249,9 @@ MINIZIP_OBJS = \ ZIP_INSTALL_OBJS = @ZIP_INSTALL_OBJS@ -CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} \ --I"${GENERIC_DIR_NATIVE}" -I"${TOMMATH_DIR_NATIVE}" \ --DMP_PREC=4 -I"${ZLIB_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \ +CC_SWITCHES = -I"${GENERIC_DIR_NATIVE}" -I"${TOMMATH_DIR_NATIVE}" \ +-I"${ZLIB_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \ +${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} -DMP_PREC=4 \ ${AC_FLAGS} ${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS} CC_OBJNAME = @CC_OBJNAME@ |