diff --git a/configure b/configure
index 3af806a1f..de28d87ca 100755
--- a/configure
+++ b/configure
@@ -7609,7 +7609,7 @@ fi
 	    SHLIB_SUFFIX=".so"
             SHLIB_LD="$CC -shared -export-dynamic"
             SHLIB_LOWER_LD="$SHLIB_LD"
-            SHLIB_LOWER_CXX_LD="$CXX -shared -export-dynamic $SHLIB_LD"
+            SHLIB_LOWER_CXX_LD="$CXX -shared -export-dynamic"
             SHLIB_SWI_LD="$CC -shared -export-dynamic"
             DO_SECOND_LD=""
 	    LIBS="$LIBS -ldl"
diff --git a/configure.in b/configure.in
index b22064159..12edddadf 100755
--- a/configure.in
+++ b/configure.in
@@ -791,7 +791,7 @@ case "$target_os" in
 	    SHLIB_SUFFIX=".so"
             SHLIB_LD="$CC -shared -export-dynamic"
             SHLIB_LOWER_LD="$SHLIB_LD"
-            SHLIB_LOWER_CXX_LD="$CXX -shared -export-dynamic $SHLIB_LD"
+            SHLIB_LOWER_CXX_LD="$CXX -shared -export-dynamic"
             SHLIB_SWI_LD="$CC -shared -export-dynamic"
             DO_SECOND_LD=""
 	    LIBS="$LIBS -ldl"
diff --git a/packages/chr b/packages/chr
index c325e4564..f6a790076 160000
--- a/packages/chr
+++ b/packages/chr
@@ -1 +1 @@
-Subproject commit c325e4564bb8d4e32c27f2061df85f13d315974e
+Subproject commit f6a79007615bf46dc79712c41d61289834f28ba3
diff --git a/packages/jpl b/packages/jpl
index a2d2f0310..eb6d27251 160000
--- a/packages/jpl
+++ b/packages/jpl
@@ -1 +1 @@
-Subproject commit a2d2f03107eecd45462cd61a678035132cf06326
+Subproject commit eb6d27251c2548c25e6d37fff2a27a014caaa7aa