Merge remote-tracking branch 'raptorjit/master' into auditlog

README.md

@@ -59,7 +59,7 @@ build environment. You can use Nix to build/test/benchmark RaptorJIT
 with suitable versions of all dependencies provided.
 
 Note: Building with nix will be slow the first time because it
-downloads the exact reference versions of the toolchain (clang, etc)
+downloads the exact reference versions of the toolchain (gcc, etc)
 and all dependencies (glibc, etc). This is all cached for future
 builds.
 
@@ -97,7 +97,7 @@ $ nix-shell    # start sub-shell with pristine build environment in $PATH
 $ make
 ```
 
-... but make sure you have at least `make`, `clang`, and `luajit` in your `$PATH`.
+... but make sure you have at least `make`, `gcc`, and `luajit` in your `$PATH`.
 
 ### Run the benchmarks
 

raptorjit.nix

@@ -3,17 +3,14 @@
 { pkgs, source, version }:
 
 with pkgs;
-with llvmPackages_4.stdenv;  # Use clang 4.0
+with stdenv;
 
 mkDerivation rec {
   name = "raptorjit-${version}";
   inherit version;
   src = source;
-  buildInputs = [
-      luajit                # LuaJIT to bootstrap DynASM
-      gcc6                  # GCC for generating DWARF info
-    ];
-  dontStrip = true;         # No extra stripping (preserve debug info)
+  buildInputs = [ luajit ];  # LuaJIT to bootstrap DynASM
+  dontStrip = true;
   installPhase = ''
     install -D src/raptorjit $out/bin/raptorjit
     install -D src/lj_dwarf.dwo $out/lib/raptorjit.dwo

src/Makefile

@@ -381,8 +381,7 @@ $(HOST_O): %.o: %.c
 
 $(DWARF_DWO): %.dwo: %.c
 	$(E) "CC(debug) $@"
-#       GCC because clang does not seem to produce decent debug info (?)
-	$(Q)gcc -g3 -gdwarf-4 -fno-eliminate-unused-debug-types -gsplit-dwarf -c $<
+	$(Q)$(TARGET_CC) -g3 -fno-eliminate-unused-debug-types -gsplit-dwarf -c $<
 
 include Makefile.dep