Created
December 25, 2013 17:57
-
-
Save Rotwang/8125363 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -pruN nqp-2013.11.orig/3rdparty/dyncall/buildsys/gmake/targets.gmake nqp-2013.11/3rdparty/dyncall/buildsys/gmake/targets.gmake | |
--- nqp-2013.11.orig/3rdparty/dyncall/buildsys/gmake/targets.gmake 2013-11-22 11:11:38.000000000 +0100 | |
+++ nqp-2013.11/3rdparty/dyncall/buildsys/gmake/targets.gmake 2013-12-23 22:08:24.000000000 +0100 | |
@@ -76,13 +76,13 @@ endif | |
dirs: $(DIRS) | |
ifdef DIRS | |
$(DIRS): | |
- $(MAKE_COMMAND) -C $@ $(MAKECMDGOALS) | |
+ $(MAKE) -C $@ $(MAKECMDGOALS) | |
endif | |
extra-dirs: $(EXTRA_DIRS) | |
ifdef EXTRA_DIRS | |
$(EXTRA_DIRS): | |
- $(MAKE_COMMAND) -C $@ $(MAKECMDGOALS) | |
+ $(MAKE) -C $@ $(MAKECMDGOALS) | |
endif | |
# --- clean ------------------------------------------------------------------- | |
diff -pruN nqp-2013.11.orig/Configure.pl nqp-2013.11/Configure.pl | |
--- nqp-2013.11.orig/Configure.pl 2013-11-22 11:11:38.000000000 +0100 | |
+++ nqp-2013.11/Configure.pl 2013-12-23 22:07:48.000000000 +0100 | |
@@ -191,7 +191,7 @@ MAIN: { | |
if ($^O eq 'netbsd') { | |
$config{'dyncall_build'} = "cd 3rdparty/dyncall && BUILD_DIR=. $make -f BSDmakefile"; | |
} else { | |
- $config{'dyncall_build'} = "cd 3rdparty/dyncall && BUILD_DIR=. $make"; | |
+ $config{'dyncall_build'} = '$(MAKE) -C 3rdparty/dyncall BUILD_DIR=.'; | |
} | |
} | |
} | |
diff -pruN nqp-2013.11.orig/tools/build/Makefile-Parrot.in nqp-2013.11/tools/build/Makefile-Parrot.in | |
--- nqp-2013.11.orig/tools/build/Makefile-Parrot.in 2013-11-22 11:11:38.000000000 +0100 | |
+++ nqp-2013.11/tools/build/Makefile-Parrot.in 2013-12-23 22:06:06.000000000 +0100 | |
@@ -1012,7 +1012,10 @@ $(OPS_DIR)/$(BIGINT_OPS)$(LOAD_EXT): $(O | |
cd src/vm/parrot/6model/reprs && $(CC) -c @cc_o_out@P6bigint$(O) -I../../../../../../$(PMC_DIR) -I../../../../../3rdparty/libtommath $(CINCLUDES) $(CFLAGS) P6bigint.c | |
cd $(OPS_DIR) && $(LD) @ld_out@$(BIGINT_OPS)$(LOAD_EXT) $(BIGINT_OPS)$(O) ../../../../3rdparty/libtommath/*$(O) ../6model/reprs/P6bigint$(O) $(LINKARGS) | |
-$(DYNCALL_BIN): | |
+$(DYNCALL_BIN): dyncall-build | |
+ | |
+.PHONY: dyncall-build | |
+dyncall-build: | |
@dyncall_build@ | |
$(OPS_DIR)/$(DYNCALL_OPS)$(LOAD_EXT): $(OPS_DIR)/$(DYNCALL_OPS_SOURCE) $(DYNCALL_BIN) src/vm/parrot/6model/reprs/NativeCall.c src/vm/parrot/6model/reprs/NativeCall.h src/vm/parrot/6model/reprs/CStruct.c src/vm/parrot/6model/reprs/CStruct.h src/vm/parrot/6model/reprs/CPointer.c src/vm/parrot/6model/reprs/CPointer.h src/vm/parrot/6model/reprs/CArray.c src/vm/parrot/6model/reprs/CArray.h src/vm/parrot/6model/reprs/CStr.c src/vm/parrot/6model/reprs/CStr.h $(OPS_DIR)/$(OPS)$(LOAD_EXT) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment