Skip to content

Commit 1c0a3ce

Browse files
committed
Merge bug/REL1_6_STABLE/issue485 into REL1_6_STABLE
2 parents 66c0b80 + 46835bb commit 1c0a3ce

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

pljava-so/pom.xml

+15-1
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@
333333
var os_name = java.lang.System.getProperty("os.name");
334334
var implementation = null;
335335
var extension = null;
336+
var pgxs = null;
336337
for (var index = 0; index < configuration.length; index ++) {
337338
if(configuration[index].probe(os_name)) {
338339
implementation = configuration[index];
@@ -342,10 +343,23 @@
342343
}
343344
}
344345
345-
var pgxs = new org.postgresql.pljava.pgxs.AbstractPGXS(implementation);
346+
if ( null !== implementation )
347+
pgxs = new org.postgresql.pljava.pgxs.AbstractPGXS(implementation);
346348
347349
function execute()
348350
{
351+
if ( null === pgxs )
352+
{
353+
return plugin.exceptionWrap("\
354+
No compiling/linking rules were selected for this platform. Rules for \
355+
supported platforms can be found below 'var configuration = [' in \
356+
pljava-so/pom.xml. If you believe one of the supported platforms should have \
357+
matched, studying its probe: function may reveal why it did not match. \
358+
An expected environment variable might not be set, for example. If your \
359+
platform is not one of those supported, please consider adding a rule set \
360+
for it, and submitting a pull request so that PL/Java can support it.", true);
361+
}
362+
349363
try
350364
{
351365
var files = utils.getFilesWithExtension(source_path, ".c");

0 commit comments

Comments
 (0)