Changeset d8f9c9 in git

Timestamp:

Jan 27, 2015, 3:31:05 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

52a01d339a6b3235b8c72306c4bbd4079100a4a9

Parents:

12788378c05390cd718f6b3f5443a1413f1699a7

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-01-27 15:31:05+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-01-27 15:32:25+01:00

Message:

Fix & "POLYMAKE_CXXFLAGS ->  FEXCEPTIONSFRTTI_CXXFLAGS"

Files:

• Singular/dyn_modules/polymake/Makefile.am (modified) (2 diffs)
• m4/flags.m4 (modified) (1 diff)

Singular/dyn_modules/polymake/Makefile.am

@@ -6 +6 @@
 ${FACTORY_INCLUDES} ${RESOURCES_INCLUDES} ${OMALLOC_INCLUDES} \
 ${FLINT_CFLAGS} ${NTL_CFLAGS} ${GMP_CFLAGS}
-# $(FEXCEPTIONS_FRTTI_CXXFLAGS) ??
+# $(FEXCEPTIONSFRTTI_CXXFLAGS) ??
 
 if SI_BUILTIN_POLYMAKE
@@ -23 +23 @@
 if SING_HAVE_POLYMAKE
 # forcefully enable exceptions for polymake
- CXXFLAGS+= $(FEXCEPTIONS_FRTTI_CXXFLAGS)
- PM_CXXFLAGS= ${FEXCEPTIONS_FRTTI_CXXFLAGS}
+ CXXFLAGS+= $(FEXCEPTIONSFRTTI_CXXFLAGS)
+ PM_CXXFLAGS= ${FEXCEPTIONSFRTTI_CXXFLAGS}
  P_PROCS_MODULE_LDFLAGS+= ${PM_LDFLAGS}
  polymake_la_LIBADD= ${PM_LIBS}

m4/flags.m4

@@ -98 +98 @@
  AC_LANG_PUSH([C++])
  AX_APPEND_COMPILE_FLAGS(${FLAGS}, [CXXFLAGS])
- AX_APPEND_COMPILE_FLAGS([-fexceptions -frtti], [FEXCEPTIONS_FRTTI_CXXFLAGS])
+
+ # separate parts of Singular have to be real C++ :)
+ FFLAGS="-fexceptions -frtti"
+ AX_APPEND_COMPILE_FLAGS(${FFLAGS}, [FEXCEPTIONSFRTTI_CXXFLAGS])
+ AC_SUBST(FEXCEPTIONSFRTTI_CXXFLAGS)
+ 
  AC_LANG_POP([C++])
 
  AX_APPEND_LINK_FLAGS(${FLAGS})
-
- AC_SUBST(POLYMAKE_CXXFLAGS)
 
  if test "x${ENABLE_DEBUG}" = xyes; then