diff options
author | Sven Gothel <[email protected]> | 2019-12-31 20:04:30 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2019-12-31 20:04:30 +0100 |
commit | c45a19eadc4c697b7cc1b095692b04deb73da5ce (patch) | |
tree | 6a6e9fd22d660f484621db6af74d9ddb1a480b45 /src/main/java | |
parent | 8353e0cc85705ca8f81f8563ad975026978b6745 (diff) |
Bug 1417: writesoname: xcode.ld uses '-install_name' instead of '-h' or '-soname'
regression from commit 07aeed47e484bfec85e749ea721756b8a2571e00 on macos
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java index 05392bd..03135a8 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java @@ -360,7 +360,11 @@ public abstract class CommandLineLinker extends AbstractLinker allArgs[index++] = decorateLinkerOption(buf, preargs[i]); } if( writeSONAME ) { - allArgs[index++] = "-Wl,-h,"+GccProcessor.getEscapedOutputFile(outputFile); + if(isXcoderun) { + allArgs[index++] = "-Wl,-install_name,"+GccProcessor.getEscapedOutputFile(outputFile); + } else { + allArgs[index++] = "-Wl,-h,"+GccProcessor.getEscapedOutputFile(outputFile); + } } for (int i = 0; i < outputSwitch.length; i++) { allArgs[index++] = outputSwitch[i]; |