Permalink
Browse files

Add nothreadlocal flag

  • Loading branch information...
David Kyle
David Kyle committed Sep 5, 2018
1 parent 7448893 commit f1928ccc3d56202bdf601df5cccff482f2b996d1
Showing with 7 additions and 4 deletions.
  1. +1 −1 gams.mpc
  2. +5 −2 scripts/linux/base_build.sh
  3. +1 −1 using_madara.mpb
@@ -1,4 +1,4 @@
project (gams) : build_files, using_madara, using_utm, using_ros, using_simtime, using_vrep, vrep_lib, ros_lib, port/java/using_android, port/java/using_java, port/java/using_openjdk, using_boost, using_nortti {
project (gams) : build_files, using_madara, using_utm, using_ros, using_simtime, using_vrep, vrep_lib, ros_lib, port/java/using_android, port/java/using_java, port/java/using_openjdk, using_boost, using_nortti, using_nothreadlocal {
libout = lib
libout = $(GAMS_ROOT)/lib
sharedname = GAMS
@@ -90,6 +90,7 @@ DOCS=0
VREP_CONFIG=0
ZMQ=0
SIMTIME=0
NOTHREADLOCAL=0
SSL=0
DMPL=0
LZ4=0
@@ -179,6 +180,8 @@ do
ZMQ=1
elif [ "$var" = "simtime" ]; then
SIMTIME=1
elif [ "$var" = "nothreadlocal" ]; then
NOTHREADLOCAL=1
elif [ "$var" = "ssl" ]; then
SSL=1
elif [ "$var" = "odroid" ]; then
@@ -776,8 +779,8 @@ if [ $MADARA -eq 1 ] || [ $MADARA_AS_A_PREREQ -eq 1 ]; then
fi
cd $MADARA_ROOT
echo "GENERATING MADARA PROJECT"
echo "perl $MPC_ROOT/mwc.pl -type make -features android=$ANDROID,python=$PYTHON,java=$JAVA,tests=$TESTS,docs=$DOCS,ssl=$SSL,zmq=$ZMQ,simtime=$SIMTIME,clang=$CLANG,debug=$DEBUG MADARA.mwc"
perl $MPC_ROOT/mwc.pl -type make -features lz4=$LZ4,android=$ANDROID,python=$PYTHON,java=$JAVA,tests=$TESTS,docs=$DOCS,ssl=$SSL,zmq=$ZMQ,simtime=$SIMTIME,clang=$CLANG,debug=$DEBUG MADARA.mwc
echo "perl $MPC_ROOT/mwc.pl -type make -features android=$ANDROID,python=$PYTHON,java=$JAVA,tests=$TESTS,docs=$DOCS,ssl=$SSL,zmq=$ZMQ,simtime=$SIMTIME,nothreadlocal=$NOTHREADLOCAL,clang=$CLANG,debug=$DEBUG MADARA.mwc"
perl $MPC_ROOT/mwc.pl -type make -features lz4=$LZ4,android=$ANDROID,python=$PYTHON,java=$JAVA,tests=$TESTS,docs=$DOCS,ssl=$SSL,zmq=$ZMQ,simtime=$SIMTIME,nothreadlocal=$NOTHREADLOCAL,clang=$CLANG,debug=$DEBUG MADARA.mwc
if [ $JAVA -eq 1 ]; then
echo "DELETING MADARA JAVA CLASSES"
@@ -1,4 +1,4 @@
project : debug_build, using_clang, using_android, using_boost {
project : debug_build, using_clang, using_android, using_boost, using_nothreadlocal {
includes += $(MADARA_ROOT)/include
includes += $(CAPNP_ROOT)/c++/src
libpaths += $(MADARA_ROOT)/lib

0 comments on commit f1928cc

Please sign in to comment.