summarylogtreecommitdiffstats
path: root/prepare.patch
blob: 20e9fd9f1f9a09c13620c89a0bd50c78aee84788 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
--- CPP/7zip/7zip_gcc.mak
+++ CPP/7zip/7zip_gcc.mak
@@ -10 +10 @@
-MY_ASM = asmc
+MY_ASM = uasm
@@ -29 +29 @@
- -fPIC
+ -fPIC -Wno-maybe-uninitialized
@@ -170 +170 @@
-LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
+LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) -Wl,-z,noexecstack $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)

--- CPP/7zip/var_gcc_x64.mak
+++ CPP/7zip/var_gcc_x64.mak
@@ -2 +2 @@
-O=b/g_$(PLATFORM)
+O=$(BUILD_DIR)