use libc++ for c++ compilation, and just skip it for sandboxed

Author: timfel

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonCC.java

@@ -60,6 +60,7 @@ public class GraalPythonCC extends GraalPythonCompiler {
     private List<String> clangArgs;
     private List<String> execLinkArgs;
     private List<String> fileInputs;
+    private boolean isCpp;
 
     GraalPythonCC() {
     }
@@ -103,6 +104,15 @@ static void main(String[] args) {
 
     private void run(String[] args) {
         parseOptions(args);
+        if (isCpp && clangArgs.stream().anyMatch(s -> s.contains("--sysroot"))) {
+            // nasty, nasty
+            logV("Refusing to compile C++ code in sandboxed mode, because we cannot actually do it");
+            try {
+                Files.createFile(Paths.get(outputFilename));
+            } catch (IOException e) {
+            }
+            return;
+        }
         launchCC();
     }
 
@@ -116,6 +126,7 @@ private void parseOptions(String[] args) {
         clangArgs = new ArrayList<>(clangPrefix);
         execLinkArgs = new ArrayList<>(execLinkPrefix);
         fileInputs = new ArrayList<>();
+        isCpp = false;
         for (int i = 0; i < args.length; i++) {
             String arg = args[i];
             switch (arg) {
@@ -152,6 +163,9 @@ private void parseOptions(String[] args) {
                         }
                         fileInputs.add(arg);
                     } else if (arg.endsWith(".c") || arg.endsWith(".cpp") || arg.endsWith(".cxx")) {
+                        if (arg.endsWith(".cpp") || arg.endsWith(".cxx")) {
+                            isCpp = true;
+                        }
                         if (compile == null) {
                             compile = true;
                         } else if (compile != true) {
@@ -168,6 +182,9 @@ private void parseOptions(String[] args) {
         if (targetFlags != null) {
             clangArgs.addAll(Arrays.asList(targetFlags.split(" ")));
         }
+        if (isCpp) {
+            clangArgs.add("-stdlib=libc++");
+        }
     }
 
     private void launchCC() {

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonLD.java

@@ -244,7 +244,7 @@ private Collection<? extends String> arMembers(String path) throws IOException,
         // in the build process, because such a smart linker should not be assumed for POSIX, but it
         // seems ok to emulate this at least for the very common case of ar archives with symbol
         // definitions that overlap what's defined in explicitly include .o files
-        for (String f : members) {
+        outer: for (String f : members) {
             if (Files.probeContentType(Paths.get(f)).contains(LLVM_IR_BITCODE)) {
                 HashSet<String> definedFuncs = new HashSet<>();
                 HashSet<String> definedGlobals = new HashSet<>();
@@ -266,7 +266,9 @@ private Collection<? extends String> arMembers(String path) throws IOException,
                             } else if (symboldef[1].toLowerCase().equals("d")) {
                                 definedGlobals.add(symboldef[2].trim());
                             } else {
-                                // ignore
+                                // keep all if we have symbols that we wouldn't know what to do with
+                                logV("Not extracting from ", f, " because there are non-strong function or global symbols");
+                                continue outer;
                             }
                         }
                     }