Merge branch 'master' into cc-for-cpychecker-v2

davidmalcolm · web-flow · commit c1c976b7ca96 · 2018-10-01T10:01:45.000-04:00
diff --git a/Makefile b/Makefile
@@ -132,7 +132,7 @@ plugin: autogenerated-config.h $(PLUGIN_DSO)
 # When running the plugin from a working copy, use LD_LIBARY_PATH=gcc-c-api
 # so that the plugin can find its libgcc-c-api.so there
 #
-INVOCATION_ENV_VARS := CC_FOR_CPYCHECKER=$(CC) LD_LIBRARY_PATH=gcc-c-api CC=$(CC)
+INVOCATION_ENV_VARS := CC_FOR_CPYCHECKER=$(CC) LD_LIBRARY_PATH=gcc-c-api:$(LD_LIBRARY_PATH) CC=$(CC)
 
 # When installing, both the plugin and libgcc-c-api.so will be installed to
 # $(GCCPLUGINS_DIR), so we give the plugin an RPATH of $(GCCPLUGINS_DIR)

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ plugin: autogenerated-config.h $(PLUGIN_DSO)`
`132`	`132`	`# When running the plugin from a working copy, use LD_LIBARY_PATH=gcc-c-api`
`133`	`133`	`# so that the plugin can find its libgcc-c-api.so there`
`134`	`134`	`#`
`135`		`-INVOCATION_ENV_VARS := CC_FOR_CPYCHECKER=$(CC) LD_LIBRARY_PATH=gcc-c-api CC=$(CC)`
	`135`	`+INVOCATION_ENV_VARS := CC_FOR_CPYCHECKER=$(CC) LD_LIBRARY_PATH=gcc-c-api:$(LD_LIBRARY_PATH) CC=$(CC)`
`136`	`136`
`137`	`137`	`# When installing, both the plugin and libgcc-c-api.so will be installed to`
`138`	`138`	`# $(GCCPLUGINS_DIR), so we give the plugin an RPATH of $(GCCPLUGINS_DIR)`