Go plugin creating invalid env

canonical · Dec 9, 2015 · 62dc469 · 62dc469
1 parent b98a170
commit 62dc469
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/snapcraft/plugins/go.py b/snapcraft/plugins/go.py
@@ -70,7 +70,7 @@ def env(self, root):
         # usr/lib/go/bin on newer Ubuntus, usr/bin on trusty
         env = [
             'GOPATH={}/go'.format(root),
-            'CGO_LDFLAGS=$CGO_LDFLAGS"' + ' '.join([
+            'CGO_LDFLAGS="$CGO_LDFLAGS ' + ' '.join([
                 '-L{0}/lib',
                 '-L{0}/usr/lib',
                 '-L{0}/lib/{1}',

diff --git a/snapcraft/tests/test_plugin_go.py b/snapcraft/tests/test_plugin_go.py
@@ -44,7 +44,7 @@ class Options:
         plugin = go.GoPlugin('test', Options())
         self.assertEqual(plugin.env('myroot'), [
             'GOPATH=myroot/go',
-            'CGO_LDFLAGS=$CGO_LDFLAGS"-Lmyroot/lib -Lmyroot/usr/lib '
+            'CGO_LDFLAGS="$CGO_LDFLAGS -Lmyroot/lib -Lmyroot/usr/lib '
             '-Lmyroot/lib/{0} '
             '-Lmyroot/usr/lib/{0} $LDFLAGS"'.format(
                 common.get_arch_triplet())])