diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 29 | ||||
| -rw-r--r-- | lib/Makefile | 4 |
3 files changed, 19 insertions, 16 deletions
@@ -6,6 +6,8 @@ TOP ?= . include $(TOP)/config.mak VPATH = $(top_srcdir) +CPPFLAGS = -I$(TOP) # for config.h + CPPFLAGS_P=$(CPPFLAGS) -DCONFIG_TCC_STATIC CFLAGS_P=$(CFLAGS) -pg -static LIBS_P= @@ -409,14 +409,14 @@ print_var2 CONFIG_TCC_LIBPATHS "$tcc_libpaths" print_var2 CONFIG_TCC_CRTPREFIX "$tcc_crtprefix" print_var2 CONFIG_TCC_ELFINTERP "$tcc_elfinterp" -echo "CC=$cc" >> config.mak -echo "GCC_MAJOR=$gcc_major" >> config.mak echo "#define GCC_MAJOR $gcc_major" >> $TMPH -echo "HOST_CC=$host_cc" >> config.mak -echo "AR=$ar" >> config.mak -echo "STRIP=$strip -s -R .comment -R .note" >> config.mak + cat >> config.mak <<EOF -CPPFLAGS = -I. -I\$(top_srcdir) +CC=$cc +GCC_MAJOR=$gcc_major +HOST_CC=$host_cc +AR=$ar +STRIP=$strip -s -R .comment -R .note CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS LIBSUF=$LIBSUF @@ -491,10 +491,12 @@ if test "$have_selinux" = "yes" ; then echo "#define HAVE_SELINUX" >> $TMPH echo "HAVE_SELINUX=yes" >> config.mak fi + version=`head $source_path/VERSION` echo "VERSION=$version" >>config.mak echo "#define TCC_VERSION \"$version\"" >> $TMPH echo "@set VERSION $version" > config.texi +echo "SRC_PATH=$source_path" >>config.mak # build tree in object directory if source path is different from current one if test "$source_path_used" = "yes" ; then @@ -511,15 +513,14 @@ if test "$source_path_used" = "yes" ; then esac ln -sf $dest $f done + case $source_path in + /*) echo "top_srcdir=$source_path";; + *) echo "top_srcdir=\$(TOP)/$source_path";; + esac >>config.mak +else + echo 'top_srcdir=$(TOP)' >>config.mak fi -cat >>config.mak <<EOF -SRC_PATH = $source_path -top_builddir = \$(TOP) -EOF -case $source_path in - /*) echo 'top_srcdir = $(SRC_PATH)';; - *) echo 'top_srcdir = $(TOP)/$(SRC_PATH)';; -esac >>config.mak +echo 'top_builddir=$(TOP)' >>config.mak diff $TMPH config.h >/dev/null 2>&1 if test $? -ne 0 ; then diff --git a/lib/Makefile b/lib/Makefile index a3e2cd1..895c4be 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -46,13 +46,13 @@ WIN64_O = $(X86_64_O) crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o ifeq "$(TARGET)" "i386-win32" OBJ = $(addprefix $(DIR)/,$(WIN32_O)) TGT = -DTCC_TARGET_I386 -DTCC_TARGET_PE - XCC = $(TCC) -B$(TOP)/win32 -I$(TOP)/include + XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include XAR = $(DIR)/tiny_libmaker$(EXESUF) else ifeq "$(TARGET)" "x86_64-win32" OBJ = $(addprefix $(DIR)/,$(WIN64_O)) TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE - XCC = $(TCC) -B$(TOP)/win32 -I$(TOP)/include + XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include XAR = $(DIR)/tiny_libmaker$(EXESUF) else ifeq "$(TARGET)" "i386" |