diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
| commit | 58d31896056e604185acf3606b99257cea519dd1 (patch) | |
| tree | 3a0fb34da5dbe8dc12326fcd7fbf0c3916028f41 /mk | |
| parent | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (diff) | |
| parent | 845317b460ee99ad633534cad4de72404af7e30b (diff) | |
resolve merge conflicts
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/package.mk | 4 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mk/package.mk b/mk/package.mk index eb2e21d31..edbf3c6d5 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -19,8 +19,8 @@ TLDFLAGS:= ${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \ -static endif ifeq ($(ADK_NATIVE),y) -TCFLAGS:= -TCXXFLAGS:= +TCFLAGS:= $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) -fwrapv +TCXXFLAGS:= TCPPFLAGS:= TLDFLAGS:= endif diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 50064b33b..122198e45 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -79,6 +79,7 @@ else ifeq ($(strip ${CONFIG_STYLE}),) --program-prefix= \ --program-suffix= \ --prefix=/usr \ + --bindir=/usr/bin \ --datadir=/usr/share \ --mandir=/usr/share/man \ --libexecdir=/usr/libexec \ |