about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile5
-rw-r--r--GNUmakefile24
2 files changed, 15 insertions, 14 deletions
diff --git a/Dockerfile b/Dockerfile
index 82854f4d..a9be22de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -75,8 +75,9 @@ COPY . .
 ARG CC=gcc-$GCC_VERSION
 ARG CXX=g++-$GCC_VERSION
 
-RUN sed -i 's/-$(MAKE)/$(MAKE)/g' GNUmakefile && make clean && \
-    make distrib && make install && make clean
+RUN sed -i.bak 's/^	-/	/g' GNUmakefile && \
+    make clean && make distrib && make install && make clean && \
+    mv GNUmakefile.bak GNUmakefile
 
 RUN echo "set encoding=utf-8" > /root/.vimrc && \
     echo ". /etc/bash_completion" >> ~/.bashrc && \
diff --git a/GNUmakefile b/GNUmakefile
index 625530bc..6e977467 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -308,7 +308,7 @@ endif
 
 .PHONY: all
 all:	test_x86 test_shm test_python ready $(PROGS) afl-as llvm gcc_plugin test_build all_done
-	$(MAKE) -C utils/aflpp_driver
+	-$(MAKE) -C utils/aflpp_driver
 
 .PHONY: llvm
 llvm:
@@ -318,7 +318,7 @@ llvm:
 .PHONY: gcc_plugin
 gcc_plugin:
 ifneq "$(SYS)" "Darwin"
-	$(MAKE) -f GNUmakefile.gcc_plugin
+	-$(MAKE) -f GNUmakefile.gcc_plugin
 endif
 
 .PHONY: man
@@ -619,7 +619,7 @@ endif
 	-$(MAKE) -C utils/afl_network_proxy
 	-$(MAKE) -C utils/socket_fuzzing
 	-$(MAKE) -C utils/argv_fuzzing
-	# $(MAKE) -C utils/plot_ui
+	# -$(MAKE) -C utils/plot_ui
 	-$(MAKE) -C frida_mode
 ifneq "$(SYS)" "Darwin"
 ifeq "$(ARCH)" "aarch64"
@@ -629,16 +629,16 @@ ifeq "$(ARCH)" "aarch64"
 endif
 ifeq "$(SYS)" "Linux"
   ifndef NO_NYX
-	cd nyx_mode && ./build_nyx_support.sh
+	-cd nyx_mode && ./build_nyx_support.sh
   endif
 endif
-	cd qemu_mode && sh ./build_qemu_support.sh
+	-cd qemu_mode && sh ./build_qemu_support.sh
   ifeq "$(ARCH)" "aarch64"
     ifndef NO_UNICORN_ARM64
-	cd unicorn_mode && unset CFLAGS && sh ./build_unicorn_support.sh
+	-cd unicorn_mode && unset CFLAGS && sh ./build_unicorn_support.sh
     endif
   else
-	cd unicorn_mode && unset CFLAGS && sh ./build_unicorn_support.sh
+	-cd unicorn_mode && unset CFLAGS && sh ./build_unicorn_support.sh
   endif
 endif
 
@@ -649,7 +649,7 @@ binary-only: test_shm test_python ready $(PROGS)
 	-$(MAKE) -C utils/afl_network_proxy
 	-$(MAKE) -C utils/socket_fuzzing
 	-$(MAKE) -C utils/argv_fuzzing
-	# $(MAKE) -C utils/plot_ui
+	# -$(MAKE) -C utils/plot_ui
 	-$(MAKE) -C frida_mode
 ifneq "$(SYS)" "Darwin"
 ifeq "$(ARCH)" "aarch64"
@@ -659,16 +659,16 @@ ifeq "$(ARCH)" "aarch64"
 endif
 ifeq "$(SYS)" "Linux"
 ifndef NO_NYX
-	cd nyx_mode && ./build_nyx_support.sh
+	-cd nyx_mode && ./build_nyx_support.sh
 endif
 endif
-	cd qemu_mode && sh ./build_qemu_support.sh
+	-cd qemu_mode && sh ./build_qemu_support.sh
   ifeq "$(ARCH)" "aarch64"
     ifndef NO_UNICORN_ARM64
-	cd unicorn_mode && unset CFLAGS && sh ./build_unicorn_support.sh
+	-cd unicorn_mode && unset CFLAGS && sh ./build_unicorn_support.sh
     endif
   else
-	cd unicorn_mode && unset CFLAGS && sh ./build_unicorn_support.sh
+	-cd unicorn_mode && unset CFLAGS && sh ./build_unicorn_support.sh
   endif
 endif