diff --git a/configure.ac b/configure.ac index 145f5b0f3..91076bd35 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ext_CFLAGS="${CFLAGS+yes}" AC_PROG_CC +AX_PROG_CC_FOR_BUILD m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) @@ -1183,4 +1184,14 @@ AC_CONFIG_FILES([Makefile tests/xspice/digital/spinit tests/resistance/Makefile tests/vbic/Makefile]) + +AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = xyes]) + +if test "x$cross_compiling" = xyes; then + AC_CONFIG_COMMANDS([mkdir], [$MKDIR_P src/xspice/cmpp/build]) + AC_SUBST([CMPP], ['$(top_builddir)/src/xspice/cmpp/build/cmpp$(BUILD_EXEEXT)']) +else + AC_SUBST([CMPP], ['$(top_builddir)/src/xspice/cmpp/cmpp$(EXEEXT)']) +fi + AC_OUTPUT diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4 new file mode 100644 index 000000000..77fd346a7 --- /dev/null +++ b/m4/ax_prog_cc_for_build.m4 @@ -0,0 +1,125 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_CC_FOR_BUILD +# +# DESCRIPTION +# +# This macro searches for a C compiler that generates native executables, +# that is a C compiler that surely is not a cross-compiler. This can be +# useful if you have to generate source code at compile-time like for +# example GCC does. +# +# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything +# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD). +# The value of these variables can be overridden by the user by specifying +# a compiler with an environment variable (like you do for standard CC). +# +# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object +# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if +# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are +# substituted in the Makefile. +# +# LICENSE +# +# Copyright (c) 2008 Paolo Bonzini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) +AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_CPP])dnl +AC_REQUIRE([AC_EXEEXT])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl + +dnl Use the standard macros, but make them use other variable names +dnl +pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl +pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl +pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl +pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl +pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl +pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl +pushdef([ac_cv_objext], ac_cv_build_objext)dnl +pushdef([ac_exeext], ac_build_exeext)dnl +pushdef([ac_objext], ac_build_objext)dnl +pushdef([CC], CC_FOR_BUILD)dnl +pushdef([CPP], CPP_FOR_BUILD)dnl +pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl +pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl +pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl +pushdef([host], build)dnl +pushdef([host_alias], build_alias)dnl +pushdef([host_cpu], build_cpu)dnl +pushdef([host_vendor], build_vendor)dnl +pushdef([host_os], build_os)dnl +pushdef([ac_cv_host], ac_cv_build)dnl +pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl +pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl +pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl +pushdef([ac_cv_host_os], ac_cv_build_os)dnl +pushdef([ac_cpp], ac_build_cpp)dnl +pushdef([ac_compile], ac_build_compile)dnl +pushdef([ac_link], ac_build_link)dnl + +save_cross_compiling=$cross_compiling +save_ac_tool_prefix=$ac_tool_prefix +cross_compiling=no +ac_tool_prefix= + +AC_PROG_CC +AC_PROG_CPP +AC_EXEEXT + +ac_tool_prefix=$save_ac_tool_prefix +cross_compiling=$save_cross_compiling + +dnl Restore the old definitions +dnl +popdef([ac_link])dnl +popdef([ac_compile])dnl +popdef([ac_cpp])dnl +popdef([ac_cv_host_os])dnl +popdef([ac_cv_host_vendor])dnl +popdef([ac_cv_host_cpu])dnl +popdef([ac_cv_host_alias])dnl +popdef([ac_cv_host])dnl +popdef([host_os])dnl +popdef([host_vendor])dnl +popdef([host_cpu])dnl +popdef([host_alias])dnl +popdef([host])dnl +popdef([LDFLAGS])dnl +popdef([CPPFLAGS])dnl +popdef([CFLAGS])dnl +popdef([CPP])dnl +popdef([CC])dnl +popdef([ac_objext])dnl +popdef([ac_exeext])dnl +popdef([ac_cv_objext])dnl +popdef([ac_cv_exeext])dnl +popdef([ac_cv_prog_cc_g])dnl +popdef([ac_cv_prog_cc_cross])dnl +popdef([ac_cv_prog_cc_works])dnl +popdef([ac_cv_prog_gcc])dnl +popdef([ac_cv_prog_CPP])dnl + +dnl Finally, set Makefile variables +dnl +BUILD_EXEEXT=$ac_build_exeext +BUILD_OBJEXT=$ac_build_objext +AC_SUBST(BUILD_EXEEXT)dnl +AC_SUBST(BUILD_OBJEXT)dnl +AC_SUBST([CFLAGS_FOR_BUILD])dnl +AC_SUBST([CPPFLAGS_FOR_BUILD])dnl +AC_SUBST([LDFLAGS_FOR_BUILD])dnl +]) diff --git a/src/misc/tilde.c b/src/misc/tilde.c index ed7141b71..151b9aa8c 100644 --- a/src/misc/tilde.c +++ b/src/misc/tilde.c @@ -13,7 +13,7 @@ Modified: 2002 R. Oktas, #if defined(__MINGW32__) || defined(_MSC_VER) #undef BOOLEAN #include /* win32 functions */ -#include "Shlobj.h" /* SHGetFolderPath */ +#include "shlobj.h" /* SHGetFolderPath */ #endif /* XXX To prevent a name collision with `readline's `tilde_expand', diff --git a/src/xspice/cmpp/Makefile.am b/src/xspice/cmpp/Makefile.am index 88aaae96d..e38bfe107 100644 --- a/src/xspice/cmpp/Makefile.am +++ b/src/xspice/cmpp/Makefile.am @@ -27,3 +27,23 @@ ifs_lex.c : ifs_lex.l ifs_yacc.c : ifs_yacc.y $(am__skipyacc) $(YACCCOMPILE) -o $@ $< + + +if CROSS_COMPILING + +BUILT_SOURCES += build/cmpp$(BUILD_EXEEXT) +CLEANFILES = build/cmpp$(BUILD_EXEEXT) + +BUILD_CMPP_FILES = main.c \ + pp_ifs.c pp_lst.c pp_mod.c read_ifs.c writ_ifs.c util.c \ + ifs_lex.c ifs_yacc.c \ + mod_lex.c mod_yacc.c + +build/cmpp$(BUILD_EXEEXT) : $(BUILD_CMPP_FILES) + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) \ + $(AM_CPPFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ $^ + +distclean-local: + -rm -rf build + +endif diff --git a/src/xspice/icm/makedefs.in b/src/xspice/icm/makedefs.in index fd23a4364..deab32e2c 100644 --- a/src/xspice/icm/makedefs.in +++ b/src/xspice/icm/makedefs.in @@ -15,6 +15,8 @@ uname = $(shell uname) # C compiler to use CC = @CC@ CFLAGS = @CFLAGS@ +EXEEXT = @EXEEXT@ +BUILD_EXEEXT = @BUILD_EXEEXT@ # Spice header include path INCLUDES = -I$(top_builddir)/src/include -I$(top_srcdir)/src/include @@ -39,7 +41,7 @@ ifeq ($(ISSUNOS), 1) endif # Path to the cmpp utility -CMPP = $(top_builddir)/src/xspice/cmpp/cmpp +CMPP = @CMPP@ LIBS = -lm