Old build system now working on both docker images

README.md

@@ -51,7 +51,7 @@ become the only build system available.
 1. Run the docker image interactively [Docker Run](https://docs.docker.com/engine/reference/run/#general-form) with the directory containing the foundationdb repo mounted [Docker Mounts](https://docs.docker.com/storage/volumes/).
 
     ```shell
-    docker run -it -v '/local/dir/path/foundationdb:/docker/dir/path/foundationdb' foundationdb/foundationdb-build:latest /bin/bash
+    docker run -it -v '/local/dir/path/foundationdb:/docker/dir/path/foundationdb' foundationdb/foundationdb-build:latest
     ```
 
 1. Navigate to the container's mounted directory which contains the foundationdb repo.

bindings/c/local.mk

@@ -31,6 +31,9 @@ CLEAN_TARGETS += fdb_c_tests_clean
 
 ifeq ($(PLATFORM),linux)
   fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
+  ifeq ($(LIBSTDCPP_HACK),1)
+    fdb_c_LIBS += lib/libstdc++.a
+  endif
   fdb_c_tests_LIBS += -lpthread
 endif
 

build/link-wrapper.sh

@@ -23,7 +23,7 @@ case $1 in
 	    OPTIONS=
 	fi
 
-	OPTIONS=$( eval echo "$OPTIONS $LDFLAGS \$$2_LDFLAGS \$$2_OBJECTS \$$2_LIBS \$$2_STATIC_LIBS_REAL -o $3" )
+	OPTIONS=$( eval echo "$OPTIONS $LDFLAGS \$$2_OBJECTS \$$2_LIBS \$$2_STATIC_LIBS_REAL \$$2_LDFLAGS -o $3" )
 
 	if echo $OPTIONS | grep -q -- -static-libstdc\+\+ ; then
 	    OPTIONS=$( echo $OPTIONS | sed -e s,-static-libstdc\+\+,, -e s,\$,\ `$CC -print-file-name=libstdc++.a`\ -lm, )

fdbserver/local.mk

@@ -26,7 +26,7 @@ fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB
 fdbserver_STATIC_LIBS := $(TLS_LIBS)
 
 ifeq ($(PLATFORM),linux)
-  fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+  fdbserver_LDFLAGS += -ldl -lpthread -lrt -static-libstdc++ -static-libgcc
 
   # GPerfTools profiler (uncomment to use)
   # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1