don't remove other plugins after build, add -lsup++ flag for linker

david-bro · Jul 22, 2017 · a7a9c3f · a7a9c3f
1 parent b7dd047
commit a7a9c3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build.sh b/build.sh
@@ -76,7 +76,8 @@ rsync -a --delete AirLib Unreal/Plugins/AirSim/Source
 
 # Update Blocks project
 Unreal/Environments/Blocks/clean.sh
-rsync -a --delete Unreal/Plugins Unreal/Environments/Blocks
+mkdir -p Unreal/Environments/Blocks/Plugins
+rsync -a --delete Unreal/Plugins/AirSim Unreal/Environments/Blocks/Plugins
 
 set +x
 

diff --git a/cmake/cmake-modules/CommonSetup.cmake b/cmake/cmake-modules/CommonSetup.cmake
@@ -75,7 +75,7 @@ macro(CommonSetup)
                     -nostdinc++ -isystem ${LIBCXX_INC_PATH} \
                     -D__CLANG__ ${CMAKE_CXX_FLAGS}")
                 set(CMAKE_EXE_LINKER_FLAGS "\
-                    ${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++ -lc++abi -lm -lc -lgcc_s -lgcc -ldl \
+                    ${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++ -lc++abi -lm -lc -lgcc_s -lgcc -lsupc++ \
                     -L ${LIBCXX_LIB_PATH}")
 
                 #do not use experimental as it might potentially cause ABI issues