summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/gcc/cross')
-rwxr-xr-xsrc/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java10
-rwxr-xr-xsrc/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
index fa2daff..3bdcf82 100755
--- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
@@ -1,5 +1,5 @@
/*
- *
+ *
* Copyright 2001-2004 The Ant-Contrib project
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +27,7 @@ import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
import org.apache.tools.ant.BuildException;
/**
* Adapter for the GCC linker
- *
+ *
* @author Adam Murdoch
*/
public class GccLinker extends AbstractLdLinker {
@@ -44,7 +44,7 @@ public class GccLinker extends AbstractLdLinker {
private static String[] linkerOptions = new String[]{"-bundle",
"-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-s",
"-static", "-shared", "-symbolic", "-Xlinker",
- "--export-all-symbols", "-static-libgcc",};
+ "--export-all-symbols", "-static-libgcc", "-static-libstdc++",};
private static final GccLinker machBundleLinker = new GccLinker("gcc",
objFiles, discardFiles, "lib", ".bundle", false, null);
private static final GccLinker machDllLinker = new GccLinker("gcc",
@@ -77,7 +77,7 @@ public class GccLinker extends AbstractLdLinker {
/**
* Allows drived linker to decorate linker option. Override by GccLinker to
* prepend a "-Wl," to pass option to through gcc to linker.
- *
+ *
* @param buf
* buffer that may be used and abused in the decoration process,
* must not be null.
@@ -124,7 +124,7 @@ public class GccLinker extends AbstractLdLinker {
}
/**
* Returns library path.
- *
+ *
*/
public File[] getLibraryPath() {
if (libDirs == null) {
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
index 89897dc..c64fa26 100755
--- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
@@ -1,5 +1,5 @@
/*
- *
+ *
* Copyright 2001-2004 The Ant-Contrib project
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,7 @@ import net.sf.antcontrib.cpptasks.compiler.Linker;
import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
/**
* Adapter for the GCC linker
- *
+ *
* @author Adam Murdoch
*/
public class GccLinker extends AbstractLdLinker {
@@ -36,7 +36,7 @@ public class GccLinker extends AbstractLdLinker {
private static String[] linkerOptions = new String[]{"-bundle",
"-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-s",
"-static", "-shared", "-symbolic", "-Xlinker",
- "--export-all-symbols", "-static-libgcc",};
+ "--export-all-symbols", "-static-libgcc", "-static-libstdc++",};
private static final GccLinker dllLinker = new GccLinker(
GccCCompiler.CMD_PREFIX + "gcc", objFiles, discardFiles, "lib",
".so", false, new GccLinker(GccCCompiler.CMD_PREFIX + "gcc",
@@ -74,7 +74,7 @@ public class GccLinker extends AbstractLdLinker {
/**
* Allows drived linker to decorate linker option. Override by GccLinker to
* prepend a "-Wl," to pass option to through gcc to linker.
- *
+ *
* @param buf
* buffer that may be used and abused in the decoration process,
* must not be null.
@@ -121,7 +121,7 @@ public class GccLinker extends AbstractLdLinker {
}
/**
* Returns library path.
- *
+ *
*/
public File[] getLibraryPath() {
if (libDirs == null) {