Skip to content
Snippets Groups Projects
Commit 1301b107 authored by Jason Hiser's avatar Jason Hiser :tractor:
Browse files

manual merge of thanos_support with submods handled properly, i hope.

Former-commit-id: d16835d0
parents 5d431ed8 359844af
No related branches found
No related tags found
No related merge requests found
Subproject commit 74ea3f485bc354237d0e5beac1fcbf40a5dd03a6 Subproject commit a49addbcfce86b846f7fc04f4abe64a9fb4bc6cb
Subproject commit f0b098f401fa9f87b8feb5caade1c704942bf516 Subproject commit ca95e4292beb6ae680eb38e0c500e89cf49f945c
Subproject commit bfbb80e4098950c26cbb0d715531b966f5187b4f Subproject commit 4ed1a54d9436a5cb085fcdd89a380746f1237209
Subproject commit 07c74130fa5cebbc4497f39b2fff2d64b82ef853 Subproject commit dadcb4a759faea3d747e58845e72a5aa31e4510b
export PEASOUP_UMBRELLA_DIR=`pwd` export PEASOUP_UMBRELLA_DIR=`pwd`
export PEDI_HOME=$PEASOUP_UMBRELLA_DIR/pedi export PEDI_HOME=$PEASOUP_UMBRELLA_DIR/pedi
export STRATAFIER_OBJCOPY=$PEASOUP_UMBRELLA_DIR/binutils-2.19/binutils/objcopy export STRATAFIER_OBJCOPY=$PEASOUP_UMBRELLA_DIR/binutils-2.19/binutils/objcopy
...@@ -37,5 +36,5 @@ fi ...@@ -37,5 +36,5 @@ fi
source ./irdb_vars source ./irdb_vars
source $PEASOUP_UMBRELLA_DIR/set_command_envs source $PEASOUP_UMBRELLA_DIR/set_command_envs
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ZEST_RUNTIME/lib32:$ZEST_RUNTIME/lib64" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ZEST_RUNTIME/lib32:$ZEST_RUNTIME/lib64:$SECURITY_TRANSFORMS_HOME/lib"
Subproject commit fe312c083e050dbfc5979f6dce3cdec66e4c666e Subproject commit feb9f8eaf7482624800f1bed83bd1e0255706831
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment