Experimental support for experimental raccoon build system

niner · Sep 1, 2016 · e746858 · e746858
1 parent dd99758
commit e746858
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/META.info b/META.info
@@ -18,5 +18,12 @@
     "license"       : "http://www.perlfoundation.org/artistic_license_2_0",
     "support"       : {
         "irc" : "irc://irc.freenode.org/#perl6"
+    },
+    "builder": "Distribution::Builder::MakeFromJSON",
+    "build": {
+        "makefile-variables": {
+            "p5helper": {"library": "p5helper"},
+            "perlopts": {"run": "perl -MExtUtils::Embed -e ccopts -e ldopts"}
+        }
     }
 }
diff --git a/Makefile.in b/Makefile.in
@@ -1,10 +1,14 @@
-.PHONY: clean test
-CC = %CC%
+.PHONY: all clean test install
+CC = %cc%
+RM = %rm%
 PERL6 = %perl6%
 
 all: %p5helper%
 clean:
-	rm "%p5helper%"
+	$(RM) "%p5helper%"
+	rmdir resources/libraries
+	rmdir resources
+	$(RM) Makefile
 %p5helper%: p5helper.c
 	$(CC) -Wall p5helper.c %perlopts% -shared -o "%p5helper%" -fPIC -g
 test: all

diff --git a/configure.pl6 b/configure.pl6
@@ -15,7 +15,7 @@ sub configure() {
         or die "\nPlease install the Filter::Simple Perl 5 module!\n";
 
     my %vars;
-    %vars<CC> = $*VM.config<cc> // $*VM.config<nativecall.cc> // 'cc';
+    %vars<cc> = $*VM.config<cc> // $*VM.config<nativecall.cc> // 'cc';
     %vars<p5helper> = p5helper().Str;
     %vars<perlopts> = run(<perl -MExtUtils::Embed -e ccopts -e ldopts>, :out).out.lines.join('');
     %vars<perl6> = $*EXECUTABLE;