diff options
| author | Derick Huth <derickhuth@gmail.com> | 2016-02-10 11:13:08 -0700 |
|---|---|---|
| committer | Derick Huth <derickhuth@gmail.com> | 2016-02-10 11:13:08 -0700 |
| commit | 1dd03ee01bff2a70e758ce984476527f3ff42c68 (patch) | |
| tree | 9731867c7019ec9b6ee111c8fa9f92a92119b5ec /omega | |
| parent | 4631ad76927d433da5d55c3c373a1dfd0f74c9d4 (diff) | |
| parent | d68532f2f3ba332199f84818cb047d69a3f33588 (diff) | |
| download | chill-1dd03ee01bff2a70e758ce984476527f3ff42c68.tar.gz chill-1dd03ee01bff2a70e758ce984476527f3ff42c68.tar.bz2 chill-1dd03ee01bff2a70e758ce984476527f3ff42c68.zip | |
Merge pull request #8 from dhuth/master
w/ python test suite
Diffstat (limited to 'omega')
| -rw-r--r-- | omega/aclocal.m4 | 3 | ||||
| -rw-r--r-- | omega/code_gen/obj/Makefile.in | 2 | ||||
| -rwxr-xr-x | omega/configure | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/omega/aclocal.m4 b/omega/aclocal.m4 index ec90bbe..a2aaad2 100644 --- a/omega/aclocal.m4 +++ b/omega/aclocal.m4 @@ -633,8 +633,7 @@ to "yes", and re-run configure. END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi -]) +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further diff --git a/omega/code_gen/obj/Makefile.in b/omega/code_gen/obj/Makefile.in index a350281..876e7e9 100644 --- a/omega/code_gen/obj/Makefile.in +++ b/omega/code_gen/obj/Makefile.in @@ -269,7 +269,7 @@ libcodegen_a_SOURCES = ../src/codegen.cc ../src/CG_stringBuilder.cc \ ../src/CG.cc ../src/CG_utils.cc ../src/rose_attributes.cc \ ../src/CG_roseRepr.cc ../src/CG_roseBuilder.cc libcodegen_a_CFLAGS = -Wno-write-strings -libcodegen_a_CPPFLAGS = -I../include -I../../omega_lib/include -I$(ROSEHOME)/include -I$(BOOSTHOME)/include +libcodegen_a_CPPFLAGS = -I../include -I../../omega_lib/include -I$(ROSEHOME)/include/rose -I$(BOOSTHOME)/include all: all-am .SUFFIXES: diff --git a/omega/configure b/omega/configure index 3a9175c..20a4dfd 100755 --- a/omega/configure +++ b/omega/configure @@ -2513,7 +2513,6 @@ END fi fi - ### Use the C++ compiler for linking (C is default) ### CCLD="$""(CXX)" |