--- src/Makefile.bis	2008-06-30 22:54:14.000000000 +1200
+++ src/Makefile	2008-06-30 22:55:34.000000000 +1200
@@ -35,7 +35,7 @@
 
 
 #MACHINE_SPECIFIC_FLAGS = -Wno-long-double
-MACHINE_SPECIFIC_FLAGS = -ffast-math
+MACHINE_SPECIFIC_FLAGS = $(CXXFLAGS)
 
 #G4 = FALSE
 #ifeq ($(G4),TRUE)
@@ -80,24 +80,10 @@
 
 #For Mac os x we omit shared library options
 
-ifeq ($(OS_NAME),Darwin)
-    LDFLAGS2 =
-else
-    LDFLAGS1 = -Xlinker -export-dynamic #not sure why pari calls these when linking but on the web I found
-    #'Libtool provides the `-export-dynamic' link flag (see section Link mode), which does this declaration.
-    #You need to use this flag if you are linking a shared library that will be dlopened'
-    #see notes below
-    #ifeq ($(PARI_DEFINE),-DINCLUDE_PARI)
-       LDFLAGS2 = $(LDFLAGS1) -Xlinker -rpath -Xlinker $(LOCATION_PARI_LIBRARY)
-    #else
-    #    LDFLAGS2 = $(LDFLAGS1)
-    #endif
-endif
-
 ifeq ($(PARI_DEFINE),-DINCLUDE_PARI)
-    LDFLAGS = $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari 
+    LDFLAGS =  -L$(LOCATION_PARI_LIBRARY) -lpari 
 else
-    LDFLAGS = $(LDFLAGS2)
+    LDFLAGS = 
 endif