Changeset 25a9b5a

Timestamp:

Aug 2, 2018, 2:52:59 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c59712e

Parents:

bf71cfd

Message:

Added defines for prelude path in tree

Files:

• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/config.h.in (modified) (2 diffs)
• src/main.cc (modified) (3 diffs)
• tests/Makefile.in (modified) (1 diff)

configure

@@ -3388 +3388 @@
 
 
+cat >>confdefs.h <<_ACEOF
+#define TOP_SRCDIR "$ac_pwd/$ac_confdir/"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define TOP_BUILDDIR "$ac_pwd/"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PRELUDE_BUILDDIR "$ac_pwd/libcfa/prelude/"
+_ACEOF
+
+
 # Flag variables needed to build in tree
 LIBCFA_SRC='$(top_srcdir)/libcfa/src'

configure.ac

@@ -178 +178 @@
 AC_SUBST(CFACC)
 AC_SUBST(CFACPP)
+AC_DEFINE_UNQUOTED(TOP_SRCDIR, "$ac_pwd/$ac_confdir/", [Top src directory])
+AC_DEFINE_UNQUOTED(TOP_BUILDDIR, "$ac_pwd/", [Top build directory])
+AC_DEFINE_UNQUOTED(PRELUDE_BUILDDIR, "$ac_pwd/libcfa/prelude/", [Directory where the prelude files are built])
 
 # Flag variables needed to build in tree

src/config.h.in

@@ -141 +141 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
+
+/* Directory where the prelude files are built */
+#undef PRELUDE_BUILDDIR
 
 /* If using the C implementation of alloca, define if you know the
@@ -152 +155 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
+
+/* Top build directory */
+#undef TOP_BUILDDIR
+
+/* Top src directory */
+#undef TOP_SRCDIR
 
 /* Version number of package */

src/main.cc

@@ -208 +208 @@
 
                         // Read to gcc builtins, if not generating the cfa library
-                        FILE * gcc_builtins = fopen( libcfap | treep ? "../prelude/gcc-builtins.cf" : CFA_LIBDIR "/gcc-builtins.cf", "r" );
+                        FILE * gcc_builtins = fopen( libcfap | treep ? PRELUDE_BUILDDIR "/gcc-builtins.cf" : CFA_LIBDIR "/gcc-builtins.cf", "r" );
                         assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" );
                         parse( gcc_builtins, LinkageSpec::Compiler );
 
                         // read the extra prelude in, if not generating the cfa library
-                        FILE * extras = fopen( libcfap | treep ? "../prelude/extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
+                        FILE * extras = fopen( libcfap | treep ? PRELUDE_BUILDDIR "/extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
                         assertf( extras, "cannot open extras.cf\n" );
                         parse( extras, LinkageSpec::BuiltinC );
@@ -219 +219 @@
                         if ( ! libcfap ) {
                                 // read the prelude in, if not generating the cfa library
-                                FILE * prelude = fopen( treep ? "../prelude/prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
+                                FILE * prelude = fopen( treep ? PRELUDE_BUILDDIR "/prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
                                 assertf( prelude, "cannot open prelude.cf\n" );
                                 parse( prelude, LinkageSpec::Intrinsic );
 
                                 // Read to cfa builtins, if not generating the cfa library
-                                FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
+                                FILE * builtins = fopen( libcfap | treep ? PRELUDE_BUILDDIR "/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                                 assertf( builtins, "cannot open builtins.cf\n" );
                                 parse( builtins, LinkageSpec::BuiltinCFA );
@@ -348 +348 @@
                 PASS( "codegen", CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks ) );
 
-                CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
+                CodeGen::FixMain::fix( *output, treep ? PRELUDE_BUILDDIR "/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
                 if ( output != &cout ) {
                         delete output;

tests/Makefile.in

@@ -313 +313 @@
 # however, here it is more complicated because it must match the dependencies based on how
 # they are generated by gcc
-headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
-headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers))
+headers = $(shell find $(top_srcdir)/libcfa/src -type f ! -name "*.*")
+headers_real = $(shell realpath --relative-to=$(top_srcdir)/libcfa/src $(headers))
 headers_deps = $(addprefix %/, $(headers_real))
 all: all-am