Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:nearinfinity/node-oracle

  • Loading branch information...
commit ab9bf21b9e52c4ccf9a7ccf4993191a0fee4dce3 2 parents 97fdeb5 + 711539e
@joeferner authored
Showing with 7 additions and 2 deletions.
  1. +7 −2 mnm.js
View
9 mnm.js
@@ -13,11 +13,16 @@ builder.appendUnique('CXXFLAGS', [ '-I' + ociIncludeDir ]);
ociLibDir = process.env["OCI_LIB_DIR"] || "/usr/lib/oracle/11.2/client/lib/";
builder.failIfNotExists(ociLibDir, 'Could not find "%s" check OCI_LIB_DIR environment variable.');
-builder.appendUnique('LINKFLAGS', [ '-L' + ociLibDir ]);
+builder.appendLinkerSearchDir(ociLibDir);
builder.appendLinkerLibrary("occi");
builder.appendLinkerLibrary("clntsh");
-builder.appendLinkerLibrary("nnz11");
+if (path.existsSync(path.join(ociLibDir, "libnnz10.dylib"))
+ || path.existsSync(path.join(ociLibDir, "libnnz10.so"))) {
+ builder.appendLinkerLibrary("nnz10");
+} else {
+ builder.appendLinkerLibrary("nnz11");
+}
builder.target = "oracle_bindings"
builder.appendSourceDir('./src');

0 comments on commit ab9bf21

Please sign in to comment.
Something went wrong with that request. Please try again.