diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-24 10:05:40 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-24 10:05:40 (GMT) |
| commit | 2d00a8c17ed3d5c994cd8dbb03df2d0ca841370e (patch) | |
| tree | 84c1602140d6620c8f1ca32208e9a82e1240bb53 | |
| parent | cf8d2f27eb557704106ab305dbb4b05d9bffae60 (diff) | |
| download | tcl-2d00a8c17ed3d5c994cd8dbb03df2d0ca841370e.zip tcl-2d00a8c17ed3d5c994cd8dbb03df2d0ca841370e.tar.gz tcl-2d00a8c17ed3d5c994cd8dbb03df2d0ca841370e.tar.bz2 | |
Put our own included (-I) directories before directories coming in though CFLAGS, so building with external libraries (like libtommath) doesn't possibly corrupt our own build. Reported by Pietro Cerutti
| -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 c971ab6..3876f1f 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 ed8c248..2243214 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@ |