From fa58da240101cb568d76f6f767636fcee3be0eba Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 7 Dec 2018 08:26:45 -0800
Subject: [PATCH] Explicitly specific build variant when installing native
 programs

---
 ci/publish-solana-tar.sh   | 2 +-
 ci/test-stable.sh          | 2 +-
 net/net.sh                 | 2 +-
 sdk/docker-solana/build.sh | 2 +-
 snap/snapcraft.yaml        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ci/publish-solana-tar.sh b/ci/publish-solana-tar.sh
index 108c63bafc..97c54dba58 100755
--- a/ci/publish-solana-tar.sh
+++ b/ci/publish-solana-tar.sh
@@ -45,7 +45,7 @@ echo --- Creating tarball
 
   cargo install --path drone --root solana-release
   cargo install --path . --root solana-release
-  ./scripts/install-native-programs.sh solana-release/bin
+  ./scripts/install-native-programs.sh solana-release/bin release
 
   ./fetch-perf-libs.sh
   # shellcheck source=/dev/null
diff --git a/ci/test-stable.sh b/ci/test-stable.sh
index 7602487677..b801423276 100755
--- a/ci/test-stable.sh
+++ b/ci/test-stable.sh
@@ -51,6 +51,6 @@ echo --- ci/localnet-sanity.sh
   # Assume |cargo build| has populated target/debug/ successfully.
   export PATH=$PWD/target/debug:$PATH
   # Move programs into the executable location so native_loader can find them
-  scripts/install-native-programs.sh "$PWD"/target/debug
+  scripts/install-native-programs.sh "$PWD"/target/debug debug
   USE_INSTALL=1 ci/localnet-sanity.sh
 )
diff --git a/net/net.sh b/net/net.sh
index f7450fd341..fb44434816 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -142,7 +142,7 @@ build() {
       cargo install --path drone --features=$cargoFeatures --root farf
       cargo install --path . --features=$cargoFeatures --root farf
     "
-    ./scripts/install-native-programs.sh farf/
+    ./scripts/install-native-programs.sh farf/ release
   )
   echo "Build took $SECONDS seconds"
 }
diff --git a/sdk/docker-solana/build.sh b/sdk/docker-solana/build.sh
index 7c6c44b04e..62fb95b97a 100755
--- a/sdk/docker-solana/build.sh
+++ b/sdk/docker-solana/build.sh
@@ -24,7 +24,7 @@ rm -rf usr/
   cargo install --path . --root sdk/docker-solana/usr
 "
 cp -f entrypoint.sh usr/bin/solana-entrypoint.sh
-../../scripts/install-native-programs.sh usr/bin/
+../../scripts/install-native-programs.sh usr/bin/ release
 
 docker build -t solanalabs/solana:$CHANNEL .
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b1de69cffd..293d4a6f84 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -95,7 +95,7 @@ parts:
       cargo install --path . --root $SNAPCRAFT_PART_INSTALL --bins
 
       # Install native programs
-      ./scripts/install-native-programs.sh $SNAPCRAFT_PART_INSTALL/bin/
+      ./scripts/install-native-programs.sh $SNAPCRAFT_PART_INSTALL/bin/ release
 
       # Install multinode-demo/
       mkdir -p $SNAPCRAFT_PART_INSTALL/multinode-demo/